Ellpeck/ActuallyAdditions
1
0
Fork 0
mirror of https://github.com/Ellpeck/ActuallyAdditions.git synced 2024-11-22 15:18:34 +01:00
Code Issues Projects Releases Wiki Activity

Adapt code to resource rename

Browse source
This commit is contained in:
Ellpeck 2016-11-16 21:56:47 +01:00
parent 1e53014383
commit b2372d4231
8 changed files with 15 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/main/java/de/ellpeck/actuallyadditions/mod/fluids/FluidAA.java
View file

@ -17,7 +17,7 @@ import net.minecraftforge.fluids.Fluid;
public class FluidAA extends Fluid{ public class FluidAA extends Fluid{
public FluidAA(String fluidName, String textureName){ 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 @Override

2
src/main/java/de/ellpeck/actuallyadditions/mod/fluids/InitFluids.java
View file

@ -44,7 +44,7 @@ public final class InitFluids{
} }
private static Fluid registerFluid(String fluidName, String fluidTextureName, EnumRarity rarity){ 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.registerFluid(fluid);
FluidRegistry.addBucketForFluid(fluid); FluidRegistry.addBucketForFluid(fluid);

2
src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemAllToolAA.java
View file

@ -58,7 +58,7 @@ public class ItemAllToolAA extends ItemToolAA implements IColorProvidingItem{
@Override @Override
protected void registerRendering(){ 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"); ActuallyAdditions.proxy.addRenderRegister(new ItemStack(this), resLoc, "inventory");
} }

4
src/main/java/de/ellpeck/actuallyadditions/mod/misc/DungeonLoot.java
View file

@ -31,8 +31,8 @@ import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
public class DungeonLoot{ public class DungeonLoot{
public static final ResourceLocation JAM_HOUSE = new ResourceLocation(ModUtil.MOD_ID, "jamHouse"); 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 LUSH_CAVES = new ResourceLocation(ModUtil.MOD_ID, "lushcaves");
public DungeonLoot(){ public DungeonLoot(){
LootTableList.register(JAM_HOUSE); LootTableList.register(JAM_HOUSE);

4
src/main/java/de/ellpeck/actuallyadditions/mod/misc/SoundHandler.java
View file

@ -14,6 +14,8 @@ import de.ellpeck.actuallyadditions.mod.util.ModUtil;
import net.minecraft.util.ResourceLocation; import net.minecraft.util.ResourceLocation;
import net.minecraft.util.SoundEvent; import net.minecraft.util.SoundEvent;
import java.util.Locale;
public final class SoundHandler{ public final class SoundHandler{
public static SoundEvent duhDuhDuhDuuuh; public static SoundEvent duhDuhDuhDuuuh;
@ -33,7 +35,7 @@ public final class SoundHandler{
} }
private static SoundEvent registerSound(String name){ 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 event = new SoundEvent(resLoc);
SoundEvent.REGISTRY.register(size, resLoc, event); SoundEvent.REGISTRY.register(size, resLoc, event);

8
src/main/java/de/ellpeck/actuallyadditions/mod/proxy/ClientProxy.java
View file

@ -34,10 +34,7 @@ import net.minecraftforge.fml.common.event.FMLInitializationEvent;
import net.minecraftforge.fml.common.event.FMLPostInitializationEvent; import net.minecraftforge.fml.common.event.FMLPostInitializationEvent;
import net.minecraftforge.fml.common.event.FMLPreInitializationEvent; import net.minecraftforge.fml.common.event.FMLPreInitializationEvent;
import java.util.ArrayList; import java.util.*;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
public class ClientProxy implements IProxy{ public class ClientProxy implements IProxy{
@ -110,7 +107,8 @@ public class ClientProxy implements IProxy{
@Override @Override
public void addRenderRegister(ItemStack stack, ResourceLocation location, String variant){ 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 @Override

6
src/main/java/de/ellpeck/actuallyadditions/mod/util/AssetUtil.java
View file

@ -34,16 +34,18 @@ import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly; import net.minecraftforge.fml.relauncher.SideOnly;
import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL11;
import java.util.Locale;
public final class AssetUtil{ public final class AssetUtil{
public static final ResourceLocation GUI_INVENTORY_LOCATION = getGuiLocation("guiInventory"); public static final ResourceLocation GUI_INVENTORY_LOCATION = getGuiLocation("guiInventory");
public static ResourceLocation getGuiLocation(String file){ 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){ public static ResourceLocation getBookletGuiLocation(String file){
return new ResourceLocation(ModUtil.MOD_ID, "textures/gui/booklet/"+file+".png"); return getGuiLocation("booklet/"+file);
} }
@SideOnly(Side.CLIENT) @SideOnly(Side.CLIENT)

1
src/main/java/de/ellpeck/actuallyadditions/mod/util/FluidStateMapper.java
View file

@ -35,7 +35,6 @@ public class FluidStateMapper extends StateMapperBase implements ItemMeshDefinit
this.location = new ModelResourceLocation(new ResourceLocation(ModUtil.MOD_ID, "fluids"), fluid.getName()); this.location = new ModelResourceLocation(new ResourceLocation(ModUtil.MOD_ID, "fluids"), fluid.getName());
} }
@Override @Override
protected ModelResourceLocation getModelResourceLocation(IBlockState state){ protected ModelResourceLocation getModelResourceLocation(IBlockState state){
return this.location; return this.location;