diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/GlobalEventHandler.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/GlobalEventHandler.kt index f8224a4ac..d9809360d 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/GlobalEventHandler.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/GlobalEventHandler.kt @@ -6,12 +6,14 @@ package ru.dbotthepony.mc.otm import net.minecraft.client.server.IntegratedServer import net.minecraft.server.MinecraftServer import net.minecraft.world.level.Level +import net.minecraftforge.api.distmarker.Dist import net.minecraftforge.event.TickEvent import net.minecraftforge.event.TickEvent.ServerTickEvent import net.minecraftforge.event.TickEvent.LevelTickEvent import net.minecraftforge.event.server.ServerAboutToStartEvent import net.minecraftforge.event.server.ServerStoppedEvent import net.minecraftforge.event.server.ServerStoppingEvent +import net.minecraftforge.fml.loading.FMLLoader import org.apache.logging.log4j.LogManager import ru.dbotthepony.mc.otm.client.minecraft import ru.dbotthepony.mc.otm.core.IConditionalTickable @@ -50,7 +52,7 @@ private var _server: MinecraftServer? = null private var _serverThread: Thread? = null private var _clientThread: Thread? = null -val isClient: Boolean get() = _clientThread !== null +val isClient: Boolean by lazy { FMLLoader.getDist() == Dist.CLIENT } private val isPausedImpl: Boolean get() { val server = _server diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/client/ClientTickHandler.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/client/ClientTickHandler.kt index d3eb21b76..52b8581d2 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/client/ClientTickHandler.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/client/ClientTickHandler.kt @@ -13,7 +13,8 @@ private val preTickList = TickList() private val postTickList = TickList() private val preTimerList = TimerQueue() private val postTimerList = TimerQueue() -private var LOGGED_IN = false +var LOGGED_IN = false + private set fun onceClient(ticker: ITickable) { check(isClient) { "Illegal side" } diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/client/MatteryGUI.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/client/MatteryGUI.kt index 5ada57490..cdf7e198a 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/client/MatteryGUI.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/client/MatteryGUI.kt @@ -27,9 +27,14 @@ import ru.dbotthepony.mc.otm.core.RGBAColor import ru.dbotthepony.mc.otm.core.formatPower import ru.dbotthepony.mc.otm.core.ifPresentK import java.util.* +import kotlin.math.ceil object MatteryGUI { - val PLAYER_GUI_LOCATION = ResourceLocation(OverdriveThatMatters.MOD_ID, "textures/gui/player_gui.png") + val CHARGE = AtlasSkinElement(ResourceLocation(OverdriveThatMatters.MOD_ID, "android_charge/android_charge")) + val CHARGE_BG = AtlasSkinElement(ResourceLocation(OverdriveThatMatters.MOD_ID, "android_charge/android_charge_bg")) + + val CHARGE_HUNGER = AtlasSkinElement(ResourceLocation(OverdriveThatMatters.MOD_ID, "android_charge/android_charge_hunger")) + val CHARGE_HUNGER_BG = AtlasSkinElement(ResourceLocation(OverdriveThatMatters.MOD_ID, "android_charge/android_charge_hunger_bg")) private var originalBedButtonX = -1 private var originalBedButtonY = -1 @@ -202,7 +207,6 @@ object MatteryGUI { return } - val yOffset = if (ply.hasEffect(MobEffects.HUNGER)) 18 else 0 var level: Float if (mattery.androidEnergy.maxBatteryLevel.isZero) { @@ -216,7 +220,6 @@ object MatteryGUI { gui.setupOverlayRenderState(true, false) RenderSystem.setShaderColor(1.0f, 1.0f, 1.0f, 1.0f) - RenderSystem.setShaderTexture(0, PLAYER_GUI_LOCATION) val width = event.window.guiScaledWidth val height = event.window.guiScaledHeight @@ -224,12 +227,15 @@ object MatteryGUI { val top: Int = height - gui.rightHeight gui.rightHeight += 10 - // Stack, x, y, blitOffset?, (float) image_x, (float) image_y, rect_x, rect_y, total_image_width, total_image_height - // Stack, x, y, image_x, image_y, rect_x, rect_y - gui.blit(event.poseStack, left, top, 0, yOffset, 80, 9) - val leftPadding = Math.ceil((level * 79f - 0.5f).toDouble()).toInt() + val leftPadding = ceil(level * 79f - 0.5f) - gui.blit(event.poseStack, left + 79 - leftPadding, top, 79 - leftPadding, yOffset + 9, leftPadding, 9) + if (ply.hasEffect(MobEffects.HUNGER)) { + CHARGE_HUNGER_BG.render(event.poseStack, left.toFloat(), top.toFloat()) + CHARGE_HUNGER.renderPartial(event.poseStack, left.toFloat() - leftPadding + 79f, top.toFloat(), width = 79f - leftPadding) + } else { + CHARGE_BG.render(event.poseStack, left.toFloat(), top.toFloat()) + CHARGE.renderPartial(event.poseStack, left.toFloat() - leftPadding + 79f, top.toFloat(), width = leftPadding) + } val formattedPower = mattery.androidEnergy.batteryLevel.formatPower() diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/client/render/AtlasSkinElement.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/client/render/AtlasSkinElement.kt index 671c8aa31..d1b0b08ef 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/client/render/AtlasSkinElement.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/client/render/AtlasSkinElement.kt @@ -13,7 +13,6 @@ import com.google.gson.stream.JsonWriter import net.minecraft.client.renderer.texture.TextureAtlasSprite import net.minecraft.network.FriendlyByteBuf import net.minecraft.resources.ResourceLocation -import ru.dbotthepony.mc.otm.client.onceClient import ru.dbotthepony.mc.otm.isClient import java.lang.reflect.Type import java.util.stream.Stream @@ -83,7 +82,7 @@ class AtlasSkinElement private constructor( companion object : TypeAdapter(), JsonSerializer, JsonDeserializer { private val skinElementCache = HashMap() - val keys: Stream get() = skinElementCache.keys.stream() + val keysStream: Stream get() = skinElementCache.keys.stream() private fun queueRebuild() { WidgetAtlasHolder.INSTANCE.queueRebuild() diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/client/render/ResearchIcons.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/client/render/ResearchIcons.kt index e31000426..0db207f22 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/client/render/ResearchIcons.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/client/render/ResearchIcons.kt @@ -36,28 +36,28 @@ object ResearchIcons { init { var i = 0 - ICON_TRANSFER = AtlasSkinElement(ResourceLocation(OverdriveThatMatters.MOD_ID, "android_stuff-${i++}")) - ICON_ATTACK_BOOST = AtlasSkinElement(ResourceLocation(OverdriveThatMatters.MOD_ID, "android_stuff-${i++}")) - ICON_PLASMA_SHIELD_BOOST = AtlasSkinElement(ResourceLocation(OverdriveThatMatters.MOD_ID, "android_stuff-${i++}")) - ICON_CLOAK = AtlasSkinElement(ResourceLocation(OverdriveThatMatters.MOD_ID, "android_stuff-${i++}")) - ICON_GRAVITATIONAL_STABILIZER = AtlasSkinElement(ResourceLocation(OverdriveThatMatters.MOD_ID, "android_stuff-${i++}")) - ICON_AIR_BAGS = AtlasSkinElement(ResourceLocation(OverdriveThatMatters.MOD_ID, "android_stuff-${i++}")) - ICON_JUMP_BOOST = AtlasSkinElement(ResourceLocation(OverdriveThatMatters.MOD_ID, "android_stuff-${i++}")) - ICON_FEATHER_FALLING = AtlasSkinElement(ResourceLocation(OverdriveThatMatters.MOD_ID, "android_stuff-${i++}")) - ICON_ITEM_MAGNET = AtlasSkinElement(ResourceLocation(OverdriveThatMatters.MOD_ID, "android_stuff-${i++}")) - ICON_ARROW = AtlasSkinElement(ResourceLocation(OverdriveThatMatters.MOD_ID, "android_stuff-${i++}")) - ICON_ARMOR = AtlasSkinElement(ResourceLocation(OverdriveThatMatters.MOD_ID, "android_stuff-${i++}")) - ICON_NANOBOTS = AtlasSkinElement(ResourceLocation(OverdriveThatMatters.MOD_ID, "android_stuff-${i++}")) - ICON_NIGHT_VISION = AtlasSkinElement(ResourceLocation(OverdriveThatMatters.MOD_ID, "android_stuff-${i++}")) - ICON_OXYGEN_SUPPLY = AtlasSkinElement(ResourceLocation(OverdriveThatMatters.MOD_ID, "android_stuff-${i++}")) - ICON_PLASMA_SHIELD = AtlasSkinElement(ResourceLocation(OverdriveThatMatters.MOD_ID, "android_stuff-${i++}")) - ICON_SHOCKWAVE = AtlasSkinElement(ResourceLocation(OverdriveThatMatters.MOD_ID, "android_stuff-${i++}")) - ICON_LIMB_OVERCLOCKING = AtlasSkinElement(ResourceLocation(OverdriveThatMatters.MOD_ID, "android_stuff-${i++}")) - ICON_STEP_ASSIST = AtlasSkinElement(ResourceLocation(OverdriveThatMatters.MOD_ID, "android_stuff-${i++}")) - ICON_ENDER_TELEPORT = AtlasSkinElement(ResourceLocation(OverdriveThatMatters.MOD_ID, "android_stuff-${i++}")) - ICON_WIRELESS_CHARGING = AtlasSkinElement(ResourceLocation(OverdriveThatMatters.MOD_ID, "android_stuff-${i++}")) - ICON_UNKNOWN = AtlasSkinElement(ResourceLocation(OverdriveThatMatters.MOD_ID, "android_stuff-${i++}")) - ICON_EXTENDED_REACH = AtlasSkinElement(ResourceLocation(OverdriveThatMatters.MOD_ID, "android_stuff-${i++}")) - ICON_PHANTOM_ATTRACTOR = AtlasSkinElement(ResourceLocation(OverdriveThatMatters.MOD_ID, "android_stuff-${i++}")) + ICON_TRANSFER = AtlasSkinElement(ResourceLocation(OverdriveThatMatters.MOD_ID, "android_research/android_stuff-${i++}")) + ICON_ATTACK_BOOST = AtlasSkinElement(ResourceLocation(OverdriveThatMatters.MOD_ID, "android_research/android_stuff-${i++}")) + ICON_PLASMA_SHIELD_BOOST = AtlasSkinElement(ResourceLocation(OverdriveThatMatters.MOD_ID, "android_research/android_stuff-${i++}")) + ICON_CLOAK = AtlasSkinElement(ResourceLocation(OverdriveThatMatters.MOD_ID, "android_research/android_stuff-${i++}")) + ICON_GRAVITATIONAL_STABILIZER = AtlasSkinElement(ResourceLocation(OverdriveThatMatters.MOD_ID, "android_research/android_stuff-${i++}")) + ICON_AIR_BAGS = AtlasSkinElement(ResourceLocation(OverdriveThatMatters.MOD_ID, "android_research/android_stuff-${i++}")) + ICON_JUMP_BOOST = AtlasSkinElement(ResourceLocation(OverdriveThatMatters.MOD_ID, "android_research/android_stuff-${i++}")) + ICON_FEATHER_FALLING = AtlasSkinElement(ResourceLocation(OverdriveThatMatters.MOD_ID, "android_research/android_stuff-${i++}")) + ICON_ITEM_MAGNET = AtlasSkinElement(ResourceLocation(OverdriveThatMatters.MOD_ID, "android_research/android_stuff-${i++}")) + ICON_ARROW = AtlasSkinElement(ResourceLocation(OverdriveThatMatters.MOD_ID, "android_research/android_stuff-${i++}")) + ICON_ARMOR = AtlasSkinElement(ResourceLocation(OverdriveThatMatters.MOD_ID, "android_research/android_stuff-${i++}")) + ICON_NANOBOTS = AtlasSkinElement(ResourceLocation(OverdriveThatMatters.MOD_ID, "android_research/android_stuff-${i++}")) + ICON_NIGHT_VISION = AtlasSkinElement(ResourceLocation(OverdriveThatMatters.MOD_ID, "android_research/android_stuff-${i++}")) + ICON_OXYGEN_SUPPLY = AtlasSkinElement(ResourceLocation(OverdriveThatMatters.MOD_ID, "android_research/android_stuff-${i++}")) + ICON_PLASMA_SHIELD = AtlasSkinElement(ResourceLocation(OverdriveThatMatters.MOD_ID, "android_research/android_stuff-${i++}")) + ICON_SHOCKWAVE = AtlasSkinElement(ResourceLocation(OverdriveThatMatters.MOD_ID, "android_research/android_stuff-${i++}")) + ICON_LIMB_OVERCLOCKING = AtlasSkinElement(ResourceLocation(OverdriveThatMatters.MOD_ID, "android_research/android_stuff-${i++}")) + ICON_STEP_ASSIST = AtlasSkinElement(ResourceLocation(OverdriveThatMatters.MOD_ID, "android_research/android_stuff-${i++}")) + ICON_ENDER_TELEPORT = AtlasSkinElement(ResourceLocation(OverdriveThatMatters.MOD_ID, "android_research/android_stuff-${i++}")) + ICON_WIRELESS_CHARGING = AtlasSkinElement(ResourceLocation(OverdriveThatMatters.MOD_ID, "android_research/android_stuff-${i++}")) + ICON_UNKNOWN = AtlasSkinElement(ResourceLocation(OverdriveThatMatters.MOD_ID, "android_research/android_stuff-${i++}")) + ICON_EXTENDED_REACH = AtlasSkinElement(ResourceLocation(OverdriveThatMatters.MOD_ID, "android_research/android_stuff-${i++}")) + ICON_PHANTOM_ATTRACTOR = AtlasSkinElement(ResourceLocation(OverdriveThatMatters.MOD_ID, "android_research/android_stuff-${i++}")) } } diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/client/render/WidgetAtlasHolder.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/client/render/WidgetAtlasHolder.kt index 0b858629a..108d161d2 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/client/render/WidgetAtlasHolder.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/client/render/WidgetAtlasHolder.kt @@ -5,11 +5,11 @@ import net.minecraft.client.renderer.texture.TextureAtlasSprite import net.minecraft.client.renderer.texture.TextureManager import net.minecraft.client.resources.TextureAtlasHolder import net.minecraft.resources.ResourceLocation -import net.minecraft.server.packs.resources.ReloadableResourceManager import net.minecraft.server.packs.resources.ResourceManager import net.minecraft.util.profiling.ProfilerFiller import net.minecraftforge.client.event.RegisterClientReloadListenersEvent import ru.dbotthepony.mc.otm.OverdriveThatMatters +import ru.dbotthepony.mc.otm.client.LOGGED_IN import ru.dbotthepony.mc.otm.client.minecraft import ru.dbotthepony.mc.otm.client.onceClient import ru.dbotthepony.mc.otm.registry.WriteOnce @@ -25,14 +25,18 @@ class WidgetAtlasHolder private constructor(manager: TextureManager) : TextureAt private var queued = false private var once = false + private var demandsRebuild = false private var resourceManager by Delegates.notNull() private var profileManager by Delegates.notNull() override fun prepare(p_118891_: ResourceManager, p_118892_: ProfilerFiller): TextureAtlas.Preparations { once = true + demandsRebuild = false + queued = false resourceManager = p_118891_ profileManager = p_118892_ + changeset++ return super.prepare(p_118891_, p_118892_) } @@ -41,6 +45,10 @@ class WidgetAtlasHolder private constructor(manager: TextureManager) : TextureAt throw IllegalStateException("Trying to get sprite too early") } + if (demandsRebuild) { + apply(prepare(resourceManager, profileManager), resourceManager, profileManager) + } + return super.getSprite(p_118902_) } @@ -48,16 +56,18 @@ class WidgetAtlasHolder private constructor(manager: TextureManager) : TextureAt if (!queued && once) { queued = true - onceClient(20) { - queued = false - apply(prepare(resourceManager, profileManager), resourceManager, profileManager) + if (LOGGED_IN) { + onceClient(20) { + apply(prepare(resourceManager, profileManager), resourceManager, profileManager) + } + } else { + demandsRebuild = true } } } override fun getResourcesToLoad(): Stream { - changeset++ - return AtlasSkinElement.keys + return AtlasSkinElement.keysStream } companion object { diff --git a/src/main/resources/assets/overdrive_that_matters/textures/gui/android_charge/android_charge.png b/src/main/resources/assets/overdrive_that_matters/textures/gui/android_charge/android_charge.png new file mode 100644 index 000000000..cb3e476ce Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/gui/android_charge/android_charge.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/gui/android_charge/android_charge_bg.png b/src/main/resources/assets/overdrive_that_matters/textures/gui/android_charge/android_charge_bg.png new file mode 100644 index 000000000..4aa9bb6d7 Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/gui/android_charge/android_charge_bg.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/gui/android_charge/android_charge_hunger.png b/src/main/resources/assets/overdrive_that_matters/textures/gui/android_charge/android_charge_hunger.png new file mode 100644 index 000000000..2299eb689 Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/gui/android_charge/android_charge_hunger.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/gui/android_charge/android_charge_hunger_bg.png b/src/main/resources/assets/overdrive_that_matters/textures/gui/android_charge/android_charge_hunger_bg.png new file mode 100644 index 000000000..ad4a0f399 Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/gui/android_charge/android_charge_hunger_bg.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/gui/android_stuff-0.png b/src/main/resources/assets/overdrive_that_matters/textures/gui/android_research/android_stuff-0.png similarity index 100% rename from src/main/resources/assets/overdrive_that_matters/textures/gui/android_stuff-0.png rename to src/main/resources/assets/overdrive_that_matters/textures/gui/android_research/android_stuff-0.png diff --git a/src/main/resources/assets/overdrive_that_matters/textures/gui/android_stuff-1.png b/src/main/resources/assets/overdrive_that_matters/textures/gui/android_research/android_stuff-1.png similarity index 100% rename from src/main/resources/assets/overdrive_that_matters/textures/gui/android_stuff-1.png rename to src/main/resources/assets/overdrive_that_matters/textures/gui/android_research/android_stuff-1.png diff --git a/src/main/resources/assets/overdrive_that_matters/textures/gui/android_stuff-10.png b/src/main/resources/assets/overdrive_that_matters/textures/gui/android_research/android_stuff-10.png similarity index 100% rename from src/main/resources/assets/overdrive_that_matters/textures/gui/android_stuff-10.png rename to src/main/resources/assets/overdrive_that_matters/textures/gui/android_research/android_stuff-10.png diff --git a/src/main/resources/assets/overdrive_that_matters/textures/gui/android_stuff-11.png b/src/main/resources/assets/overdrive_that_matters/textures/gui/android_research/android_stuff-11.png similarity index 100% rename from src/main/resources/assets/overdrive_that_matters/textures/gui/android_stuff-11.png rename to src/main/resources/assets/overdrive_that_matters/textures/gui/android_research/android_stuff-11.png diff --git a/src/main/resources/assets/overdrive_that_matters/textures/gui/android_stuff-12.png b/src/main/resources/assets/overdrive_that_matters/textures/gui/android_research/android_stuff-12.png similarity index 100% rename from src/main/resources/assets/overdrive_that_matters/textures/gui/android_stuff-12.png rename to src/main/resources/assets/overdrive_that_matters/textures/gui/android_research/android_stuff-12.png diff --git a/src/main/resources/assets/overdrive_that_matters/textures/gui/android_stuff-13.png b/src/main/resources/assets/overdrive_that_matters/textures/gui/android_research/android_stuff-13.png similarity index 100% rename from src/main/resources/assets/overdrive_that_matters/textures/gui/android_stuff-13.png rename to src/main/resources/assets/overdrive_that_matters/textures/gui/android_research/android_stuff-13.png diff --git a/src/main/resources/assets/overdrive_that_matters/textures/gui/android_stuff-14.png b/src/main/resources/assets/overdrive_that_matters/textures/gui/android_research/android_stuff-14.png similarity index 100% rename from src/main/resources/assets/overdrive_that_matters/textures/gui/android_stuff-14.png rename to src/main/resources/assets/overdrive_that_matters/textures/gui/android_research/android_stuff-14.png diff --git a/src/main/resources/assets/overdrive_that_matters/textures/gui/android_stuff-15.png b/src/main/resources/assets/overdrive_that_matters/textures/gui/android_research/android_stuff-15.png similarity index 100% rename from src/main/resources/assets/overdrive_that_matters/textures/gui/android_stuff-15.png rename to src/main/resources/assets/overdrive_that_matters/textures/gui/android_research/android_stuff-15.png diff --git a/src/main/resources/assets/overdrive_that_matters/textures/gui/android_stuff-16.png b/src/main/resources/assets/overdrive_that_matters/textures/gui/android_research/android_stuff-16.png similarity index 100% rename from src/main/resources/assets/overdrive_that_matters/textures/gui/android_stuff-16.png rename to src/main/resources/assets/overdrive_that_matters/textures/gui/android_research/android_stuff-16.png diff --git a/src/main/resources/assets/overdrive_that_matters/textures/gui/android_stuff-17.png b/src/main/resources/assets/overdrive_that_matters/textures/gui/android_research/android_stuff-17.png similarity index 100% rename from src/main/resources/assets/overdrive_that_matters/textures/gui/android_stuff-17.png rename to src/main/resources/assets/overdrive_that_matters/textures/gui/android_research/android_stuff-17.png diff --git a/src/main/resources/assets/overdrive_that_matters/textures/gui/android_stuff-18.png b/src/main/resources/assets/overdrive_that_matters/textures/gui/android_research/android_stuff-18.png similarity index 100% rename from src/main/resources/assets/overdrive_that_matters/textures/gui/android_stuff-18.png rename to src/main/resources/assets/overdrive_that_matters/textures/gui/android_research/android_stuff-18.png diff --git a/src/main/resources/assets/overdrive_that_matters/textures/gui/android_stuff-19.png b/src/main/resources/assets/overdrive_that_matters/textures/gui/android_research/android_stuff-19.png similarity index 100% rename from src/main/resources/assets/overdrive_that_matters/textures/gui/android_stuff-19.png rename to src/main/resources/assets/overdrive_that_matters/textures/gui/android_research/android_stuff-19.png diff --git a/src/main/resources/assets/overdrive_that_matters/textures/gui/android_stuff-2.png b/src/main/resources/assets/overdrive_that_matters/textures/gui/android_research/android_stuff-2.png similarity index 100% rename from src/main/resources/assets/overdrive_that_matters/textures/gui/android_stuff-2.png rename to src/main/resources/assets/overdrive_that_matters/textures/gui/android_research/android_stuff-2.png diff --git a/src/main/resources/assets/overdrive_that_matters/textures/gui/android_stuff-20.png b/src/main/resources/assets/overdrive_that_matters/textures/gui/android_research/android_stuff-20.png similarity index 100% rename from src/main/resources/assets/overdrive_that_matters/textures/gui/android_stuff-20.png rename to src/main/resources/assets/overdrive_that_matters/textures/gui/android_research/android_stuff-20.png diff --git a/src/main/resources/assets/overdrive_that_matters/textures/gui/android_stuff-21.png b/src/main/resources/assets/overdrive_that_matters/textures/gui/android_research/android_stuff-21.png similarity index 100% rename from src/main/resources/assets/overdrive_that_matters/textures/gui/android_stuff-21.png rename to src/main/resources/assets/overdrive_that_matters/textures/gui/android_research/android_stuff-21.png diff --git a/src/main/resources/assets/overdrive_that_matters/textures/gui/android_stuff-22.png b/src/main/resources/assets/overdrive_that_matters/textures/gui/android_research/android_stuff-22.png similarity index 100% rename from src/main/resources/assets/overdrive_that_matters/textures/gui/android_stuff-22.png rename to src/main/resources/assets/overdrive_that_matters/textures/gui/android_research/android_stuff-22.png diff --git a/src/main/resources/assets/overdrive_that_matters/textures/gui/android_stuff-3.png b/src/main/resources/assets/overdrive_that_matters/textures/gui/android_research/android_stuff-3.png similarity index 100% rename from src/main/resources/assets/overdrive_that_matters/textures/gui/android_stuff-3.png rename to src/main/resources/assets/overdrive_that_matters/textures/gui/android_research/android_stuff-3.png diff --git a/src/main/resources/assets/overdrive_that_matters/textures/gui/android_stuff-4.png b/src/main/resources/assets/overdrive_that_matters/textures/gui/android_research/android_stuff-4.png similarity index 100% rename from src/main/resources/assets/overdrive_that_matters/textures/gui/android_stuff-4.png rename to src/main/resources/assets/overdrive_that_matters/textures/gui/android_research/android_stuff-4.png diff --git a/src/main/resources/assets/overdrive_that_matters/textures/gui/android_stuff-5.png b/src/main/resources/assets/overdrive_that_matters/textures/gui/android_research/android_stuff-5.png similarity index 100% rename from src/main/resources/assets/overdrive_that_matters/textures/gui/android_stuff-5.png rename to src/main/resources/assets/overdrive_that_matters/textures/gui/android_research/android_stuff-5.png diff --git a/src/main/resources/assets/overdrive_that_matters/textures/gui/android_stuff-6.png b/src/main/resources/assets/overdrive_that_matters/textures/gui/android_research/android_stuff-6.png similarity index 100% rename from src/main/resources/assets/overdrive_that_matters/textures/gui/android_stuff-6.png rename to src/main/resources/assets/overdrive_that_matters/textures/gui/android_research/android_stuff-6.png diff --git a/src/main/resources/assets/overdrive_that_matters/textures/gui/android_stuff-7.png b/src/main/resources/assets/overdrive_that_matters/textures/gui/android_research/android_stuff-7.png similarity index 100% rename from src/main/resources/assets/overdrive_that_matters/textures/gui/android_stuff-7.png rename to src/main/resources/assets/overdrive_that_matters/textures/gui/android_research/android_stuff-7.png diff --git a/src/main/resources/assets/overdrive_that_matters/textures/gui/android_stuff-8.png b/src/main/resources/assets/overdrive_that_matters/textures/gui/android_research/android_stuff-8.png similarity index 100% rename from src/main/resources/assets/overdrive_that_matters/textures/gui/android_stuff-8.png rename to src/main/resources/assets/overdrive_that_matters/textures/gui/android_research/android_stuff-8.png diff --git a/src/main/resources/assets/overdrive_that_matters/textures/gui/android_stuff-9.png b/src/main/resources/assets/overdrive_that_matters/textures/gui/android_research/android_stuff-9.png similarity index 100% rename from src/main/resources/assets/overdrive_that_matters/textures/gui/android_stuff-9.png rename to src/main/resources/assets/overdrive_that_matters/textures/gui/android_research/android_stuff-9.png diff --git a/src/main/resources/assets/overdrive_that_matters/textures/gui/android_stuff-23.png b/src/main/resources/assets/overdrive_that_matters/textures/gui/android_stuff-23.png deleted file mode 100644 index b29a0723b..000000000 Binary files a/src/main/resources/assets/overdrive_that_matters/textures/gui/android_stuff-23.png and /dev/null differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/gui/android_stuff-24.png b/src/main/resources/assets/overdrive_that_matters/textures/gui/android_stuff-24.png deleted file mode 100644 index 05b214cad..000000000 Binary files a/src/main/resources/assets/overdrive_that_matters/textures/gui/android_stuff-24.png and /dev/null differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/gui/player_gui.png b/src/main/resources/assets/overdrive_that_matters/textures/gui/player_gui.png deleted file mode 100644 index a25e2aa82..000000000 Binary files a/src/main/resources/assets/overdrive_that_matters/textures/gui/player_gui.png and /dev/null differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/gui/player_gui.xcf b/src/main/resources/assets/overdrive_that_matters/textures/gui/player_gui.xcf deleted file mode 100644 index 99545f943..000000000 Binary files a/src/main/resources/assets/overdrive_that_matters/textures/gui/player_gui.xcf and /dev/null differ