From b2372d4231144a9e22e2618ea4c52108cab3ac74 Mon Sep 17 00:00:00 2001 From: Ellpeck Date: Wed, 16 Nov 2016 21:56:47 +0100 Subject: [PATCH] Adapt code to resource rename --- .../de/ellpeck/actuallyadditions/mod/fluids/FluidAA.java | 2 +- .../ellpeck/actuallyadditions/mod/fluids/InitFluids.java | 2 +- .../actuallyadditions/mod/items/ItemAllToolAA.java | 2 +- .../ellpeck/actuallyadditions/mod/misc/DungeonLoot.java | 4 ++-- .../ellpeck/actuallyadditions/mod/misc/SoundHandler.java | 4 +++- .../ellpeck/actuallyadditions/mod/proxy/ClientProxy.java | 8 +++----- .../de/ellpeck/actuallyadditions/mod/util/AssetUtil.java | 6 ++++-- .../actuallyadditions/mod/util/FluidStateMapper.java | 1 - 8 files changed, 15 insertions(+), 14 deletions(-) diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/fluids/FluidAA.java b/src/main/java/de/ellpeck/actuallyadditions/mod/fluids/FluidAA.java index c1bd9b6ff..7c0922dd2 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/fluids/FluidAA.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/fluids/FluidAA.java @@ -17,7 +17,7 @@ import net.minecraftforge.fluids.Fluid; public class FluidAA extends Fluid{ public FluidAA(String fluidName, String textureName){ - super(fluidName, new ResourceLocation(ModUtil.MOD_ID, "blocks/"+textureName+"Still"), new ResourceLocation(ModUtil.MOD_ID, "blocks/"+textureName+"Flowing")); + super(fluidName, new ResourceLocation(ModUtil.MOD_ID, "blocks/"+textureName+"still"), new ResourceLocation(ModUtil.MOD_ID, "blocks/"+textureName+"flowing")); } @Override diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/fluids/InitFluids.java b/src/main/java/de/ellpeck/actuallyadditions/mod/fluids/InitFluids.java index dd09fcbba..915bb4847 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/fluids/InitFluids.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/fluids/InitFluids.java @@ -44,7 +44,7 @@ public final class InitFluids{ } private static Fluid registerFluid(String fluidName, String fluidTextureName, EnumRarity rarity){ - Fluid fluid = new FluidAA(fluidName.toLowerCase(Locale.ROOT), fluidTextureName).setRarity(rarity); + Fluid fluid = new FluidAA(fluidName.toLowerCase(Locale.ROOT), fluidTextureName.toLowerCase(Locale.ROOT)).setRarity(rarity); FluidRegistry.registerFluid(fluid); FluidRegistry.addBucketForFluid(fluid); diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemAllToolAA.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemAllToolAA.java index 82a73cecf..3f9ed901a 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemAllToolAA.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemAllToolAA.java @@ -58,7 +58,7 @@ public class ItemAllToolAA extends ItemToolAA implements IColorProvidingItem{ @Override protected void registerRendering(){ - ResourceLocation resLoc = new ResourceLocation(ModUtil.MOD_ID, "itemPaxel"); + ResourceLocation resLoc = new ResourceLocation(ModUtil.MOD_ID, "itempaxel"); ActuallyAdditions.proxy.addRenderRegister(new ItemStack(this), resLoc, "inventory"); } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/misc/DungeonLoot.java b/src/main/java/de/ellpeck/actuallyadditions/mod/misc/DungeonLoot.java index e9842e6fa..1b47bace9 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/misc/DungeonLoot.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/misc/DungeonLoot.java @@ -31,8 +31,8 @@ import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; public class DungeonLoot{ - public static final ResourceLocation JAM_HOUSE = new ResourceLocation(ModUtil.MOD_ID, "jamHouse"); - public static final ResourceLocation LUSH_CAVES = new ResourceLocation(ModUtil.MOD_ID, "lushCaves"); + public static final ResourceLocation JAM_HOUSE = new ResourceLocation(ModUtil.MOD_ID, "jamhouse"); + public static final ResourceLocation LUSH_CAVES = new ResourceLocation(ModUtil.MOD_ID, "lushcaves"); public DungeonLoot(){ LootTableList.register(JAM_HOUSE); diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/misc/SoundHandler.java b/src/main/java/de/ellpeck/actuallyadditions/mod/misc/SoundHandler.java index 8b88c32c3..e4353d73f 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/misc/SoundHandler.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/misc/SoundHandler.java @@ -14,6 +14,8 @@ import de.ellpeck.actuallyadditions.mod.util.ModUtil; import net.minecraft.util.ResourceLocation; import net.minecraft.util.SoundEvent; +import java.util.Locale; + public final class SoundHandler{ public static SoundEvent duhDuhDuhDuuuh; @@ -33,7 +35,7 @@ public final class SoundHandler{ } private static SoundEvent registerSound(String name){ - ResourceLocation resLoc = new ResourceLocation(ModUtil.MOD_ID, name); + ResourceLocation resLoc = new ResourceLocation(ModUtil.MOD_ID, name.toLowerCase(Locale.ROOT)); SoundEvent event = new SoundEvent(resLoc); SoundEvent.REGISTRY.register(size, resLoc, event); diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/proxy/ClientProxy.java b/src/main/java/de/ellpeck/actuallyadditions/mod/proxy/ClientProxy.java index 518a077d9..f8b62daee 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/proxy/ClientProxy.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/proxy/ClientProxy.java @@ -34,10 +34,7 @@ import net.minecraftforge.fml.common.event.FMLInitializationEvent; import net.minecraftforge.fml.common.event.FMLPostInitializationEvent; import net.minecraftforge.fml.common.event.FMLPreInitializationEvent; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import java.util.*; public class ClientProxy implements IProxy{ @@ -110,7 +107,8 @@ public class ClientProxy implements IProxy{ @Override public void addRenderRegister(ItemStack stack, ResourceLocation location, String variant){ - MODEL_LOCATIONS_FOR_REGISTERING.put(stack, new ModelResourceLocation(location, variant)); + ResourceLocation lowerLocation = new ResourceLocation(location.toString().toLowerCase(Locale.ROOT)); + MODEL_LOCATIONS_FOR_REGISTERING.put(stack, new ModelResourceLocation(lowerLocation, variant)); } @Override diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/util/AssetUtil.java b/src/main/java/de/ellpeck/actuallyadditions/mod/util/AssetUtil.java index a420b9e68..2dc681008 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/util/AssetUtil.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/util/AssetUtil.java @@ -34,16 +34,18 @@ import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import org.lwjgl.opengl.GL11; +import java.util.Locale; + public final class AssetUtil{ public static final ResourceLocation GUI_INVENTORY_LOCATION = getGuiLocation("guiInventory"); public static ResourceLocation getGuiLocation(String file){ - return new ResourceLocation(ModUtil.MOD_ID, "textures/gui/"+file+".png"); + return new ResourceLocation(ModUtil.MOD_ID, "textures/gui/"+file.toLowerCase(Locale.ROOT)+".png"); } public static ResourceLocation getBookletGuiLocation(String file){ - return new ResourceLocation(ModUtil.MOD_ID, "textures/gui/booklet/"+file+".png"); + return getGuiLocation("booklet/"+file); } @SideOnly(Side.CLIENT) diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/util/FluidStateMapper.java b/src/main/java/de/ellpeck/actuallyadditions/mod/util/FluidStateMapper.java index 1112b9373..607ff5417 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/util/FluidStateMapper.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/util/FluidStateMapper.java @@ -35,7 +35,6 @@ public class FluidStateMapper extends StateMapperBase implements ItemMeshDefinit this.location = new ModelResourceLocation(new ResourceLocation(ModUtil.MOD_ID, "fluids"), fluid.getName()); } - @Override protected ModelResourceLocation getModelResourceLocation(IBlockState state){ return this.location;