Skip to content

Commit a439a2a

Browse files
TrainerGuy22TrainerGuy22
committed
Closes #208.
I fixed it just like I said we could do in the issue itself.
1 parent 19ddaf2 commit a439a2a

28 files changed

+83
-136
lines changed

Diff for: ‎src/main/java/xreliquary/CreativeTabXR.java

+1-4
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,10 @@
22

33
import cpw.mods.fml.relauncher.Side;
44
import cpw.mods.fml.relauncher.SideOnly;
5-
import lib.enderwizards.sandstone.init.ContentHandler;
65
import net.minecraft.creativetab.CreativeTabs;
76
import net.minecraft.item.Item;
87
import xreliquary.lib.Names;
98

10-
import javax.print.attribute.standard.Sides;
11-
129
public class CreativeTabXR extends CreativeTabs {
1310

1411
public CreativeTabXR(int ID, String langName) {
@@ -18,7 +15,7 @@ public CreativeTabXR(int ID, String langName) {
1815
@Override
1916
@SideOnly(Side.CLIENT)
2017
public Item getTabIconItem() {
21-
return ContentHandler.getItem(Names.mercy_cross);
18+
return Reliquary.CONTENT.getItem(Names.mercy_cross);
2219
}
2320

2421
}

Diff for: ‎src/main/java/xreliquary/Reliquary.java

+3-2
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
import cpw.mods.fml.common.event.FMLPostInitializationEvent;
1111
import cpw.mods.fml.common.event.FMLPreInitializationEvent;
1212
import lib.enderwizards.sandstone.Sandstone;
13+
import lib.enderwizards.sandstone.init.Content;
1314
import lib.enderwizards.sandstone.mod.SandstoneMod;
1415
import lib.enderwizards.sandstone.mod.config.Config;
1516
import net.minecraft.creativetab.CreativeTabs;
@@ -44,17 +45,17 @@ public class Reliquary {
4445
@SidedProxy(clientSide = Reference.CLIENT_PROXY, serverSide = Reference.COMMON_PROXY)
4546
public static CommonProxy PROXY;
4647

48+
public static Content CONTENT;
4749
public static Config CONFIG;
4850
public static CreativeTabs CREATIVE_TAB = new CreativeTabXR(CreativeTabs.getNextID(), Reference.MOD_ID);
4951
public static Logger LOGGER = LogManager.getLogger(Reference.MOD_ID);
5052

5153
@EventHandler
5254
public void preInit(FMLPreInitializationEvent event) {
5355
CONFIG = Config.toml(new File(event.getModConfigurationDirectory(), Reference.MOD_ID + ".cfg"));
54-
5556
PROXY.initOptions();
5657

57-
Sandstone.preInit();
58+
CONTENT = Sandstone.preInit();
5859

5960
WorldDataHandler.register();
6061

Diff for: ‎src/main/java/xreliquary/blocks/BlockAlkahestryAltar.java

+3-4
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
import cpw.mods.fml.relauncher.Side;
44
import cpw.mods.fml.relauncher.SideOnly;
5-
import lib.enderwizards.sandstone.init.ContentHandler;
65
import lib.enderwizards.sandstone.init.ContentInit;
76
import lib.enderwizards.sandstone.util.NBTHelper;
87
import net.minecraft.block.BlockContainer;
@@ -76,7 +75,7 @@ public void registerBlockIcons(IIconRegister iconRegister) {
7675

7776
@Override
7877
public Item getItemDropped(int par1, Random random, int par3) {
79-
return ItemBlock.getItemFromBlock(ContentHandler.getBlock(Names.altar_idle));
78+
return ItemBlock.getItemFromBlock(Reliquary.CONTENT.getBlock(Names.altar_idle));
8079
}
8180

8281
@Override
@@ -142,9 +141,9 @@ public static void updateAltarBlockState(boolean active, World world, int x, int
142141
int meta = world.getBlockMetadata(x, y, z);
143142
TileEntity te = world.getTileEntity(x, y, z);
144143
if (active) {
145-
world.setBlock(x, y, z, ContentHandler.getBlock(Names.altar));
144+
world.setBlock(x, y, z, Reliquary.CONTENT.getBlock(Names.altar));
146145
} else {
147-
world.setBlock(x, y, z, ContentHandler.getBlock(Names.altar_idle));
146+
world.setBlock(x, y, z, Reliquary.CONTENT.getBlock(Names.altar_idle));
148147
}
149148

150149
world.setBlockMetadataWithNotify(x, y, z, meta, 3);

Diff for: ‎src/main/java/xreliquary/blocks/BlockApothecaryCauldron.java

+5-9
Original file line numberDiff line numberDiff line change
@@ -3,18 +3,15 @@
33
import cpw.mods.fml.relauncher.Side;
44
import cpw.mods.fml.relauncher.SideOnly;
55
import lib.enderwizards.sandstone.blocks.BlockBase;
6-
import lib.enderwizards.sandstone.init.ContentHandler;
76
import lib.enderwizards.sandstone.init.ContentInit;
87
import net.minecraft.block.material.Material;
98
import net.minecraft.client.renderer.texture.IIconRegister;
109
import net.minecraft.entity.Entity;
1110
import net.minecraft.entity.EntityLivingBase;
1211
import net.minecraft.entity.item.EntityItem;
1312
import net.minecraft.entity.player.EntityPlayer;
14-
import net.minecraft.entity.player.EntityPlayerMP;
1513
import net.minecraft.init.Items;
1614
import net.minecraft.item.Item;
17-
import net.minecraft.item.ItemArmor;
1815
import net.minecraft.item.ItemBlock;
1916
import net.minecraft.item.ItemStack;
2017
import net.minecraft.potion.Potion;
@@ -30,7 +27,6 @@
3027
import xreliquary.client.render.RenderApothecaryCauldron;
3128
import xreliquary.lib.Names;
3229
import xreliquary.lib.Reference;
33-
import xreliquary.util.potions.PotionEssence;
3430

3531
import java.util.List;
3632
import java.util.Random;
@@ -93,7 +89,7 @@ public void addCollisionBoxesToList(World world, int x, int y, int z, AxisAligne
9389
// called by the renderer to get the texture in a static method.
9490
@SideOnly(Side.CLIENT)
9591
public static IIcon getCauldronIcon(String textureName) {
96-
BlockApothecaryCauldron cauldronStatic = (BlockApothecaryCauldron) ContentHandler.getBlock(Names.apothecary_cauldron);
92+
BlockApothecaryCauldron cauldronStatic = (BlockApothecaryCauldron) Reliquary.CONTENT.getBlock(Names.apothecary_cauldron);
9793
return textureName.equals("inner") ? cauldronStatic.innerTexture : (textureName.equals("bottom") ? cauldronStatic.bottomTexture : textureName.equals("inside") ? cauldronStatic.insideTexture : null);
9894
}
9995

@@ -199,11 +195,11 @@ public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer p
199195

200196
return true;
201197
} else {
202-
if (itemstack.getItem() == ContentHandler.getItem(Names.potion) && (itemstack.getTagCompound() == null || !itemstack.getTagCompound().getBoolean("hasPotion"))) {
198+
if (itemstack.getItem() == Reliquary.CONTENT.getItem(Names.potion) && (itemstack.getTagCompound() == null || !itemstack.getTagCompound().getBoolean("hasPotion"))) {
203199
if (j1 > 0) {
204200

205201
if (cauldron.finishedCooking()) {
206-
ItemStack potion = new ItemStack(ContentHandler.getItem(Names.potion), 1, 0);
202+
ItemStack potion = new ItemStack(Reliquary.CONTENT.getItem(Names.potion), 1, 0);
207203
potion.setTagCompound(cauldron.removeContainedPotion());
208204

209205
--itemstack.stackSize;
@@ -252,15 +248,15 @@ public void fillWithRain(World world, int x, int y, int z) {
252248
@Override
253249
public Item getItemDropped(int someInt, Random unusedRandom, int fortuneEnchantLevelIThink) {
254250
// this might destroy the universe
255-
return ItemBlock.getItemFromBlock(ContentHandler.getBlock(Names.apothecary_cauldron));
251+
return ItemBlock.getItemFromBlock(Reliquary.CONTENT.getBlock(Names.apothecary_cauldron));
256252
}
257253

258254
/**
259255
* Gets an item for the block being called on. Args: world, x, y, z
260256
*/
261257
@SideOnly(Side.CLIENT)
262258
public Item getItem(World world, int x, int y, int z) {
263-
return ItemBlock.getItemFromBlock(ContentHandler.getBlock(Names.apothecary_cauldron));
259+
return ItemBlock.getItemFromBlock(Reliquary.CONTENT.getBlock(Names.apothecary_cauldron));
264260
}
265261

266262
/**

Diff for: ‎src/main/java/xreliquary/blocks/BlockApothecaryMortar.java

+2-3
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
import cpw.mods.fml.relauncher.Side;
44
import cpw.mods.fml.relauncher.SideOnly;
55
import lib.enderwizards.sandstone.blocks.BlockBase;
6-
import lib.enderwizards.sandstone.init.ContentHandler;
76
import lib.enderwizards.sandstone.init.ContentInit;
87
import net.minecraft.block.material.Material;
98
import net.minecraft.entity.Entity;
@@ -91,12 +90,12 @@ public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer p
9190
@Override
9291
public Item getItemDropped(int someInt, Random unusedRandom, int fortuneEnchantLevelIThink) {
9392
// this might destroy the universe
94-
return ItemBlock.getItemFromBlock(ContentHandler.getBlock(Names.apothecary_mortar));
93+
return ItemBlock.getItemFromBlock(Reliquary.CONTENT.getBlock(Names.apothecary_mortar));
9594
}
9695

9796
@SideOnly(Side.CLIENT)
9897
public Item getItem(World world, int x, int y, int z) {
99-
return ItemBlock.getItemFromBlock(ContentHandler.getBlock(Names.apothecary_mortar));
98+
return ItemBlock.getItemFromBlock(Reliquary.CONTENT.getBlock(Names.apothecary_mortar));
10099
}
101100

102101
@Override

Diff for: ‎src/main/java/xreliquary/blocks/tile/TileEntityCauldron.java

+2-3
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
import cpw.mods.fml.relauncher.Side;
55
import cpw.mods.fml.relauncher.SideOnly;
66
import lib.enderwizards.sandstone.blocks.tile.TileEntityBase;
7-
import lib.enderwizards.sandstone.init.ContentHandler;
87
import net.minecraft.block.Block;
98
import net.minecraft.block.BlockCauldron;
109
import net.minecraft.init.Blocks;
@@ -236,8 +235,8 @@ public List<Block> getHeatSources() {
236235
List<String> heatSourceBlockNames = (List<String>) Reliquary.CONFIG.get(Names.apothecary_cauldron, "heat_sources");
237236

238237
for (String blockName : heatSourceBlockNames) {
239-
if (!heatSources.contains(ContentHandler.getBlock(blockName)))
240-
heatSources.add(ContentHandler.getBlock(blockName));
238+
if (!heatSources.contains(Reliquary.CONTENT.getBlock(blockName)))
239+
heatSources.add(Reliquary.CONTENT.getBlock(blockName));
241240
}
242241
//defaults that can't be removed.
243242
heatSources.add(Blocks.lava);

Diff for: ‎src/main/java/xreliquary/blocks/tile/TileEntityMortar.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
import cpw.mods.fml.common.FMLCommonHandler;
44
import cpw.mods.fml.relauncher.Side;
55
import lib.enderwizards.sandstone.blocks.tile.TileEntityInventory;
6-
import lib.enderwizards.sandstone.init.ContentHandler;
76
import net.minecraft.entity.item.EntityItem;
87
import net.minecraft.entity.player.EntityPlayer;
98
import net.minecraft.item.ItemStack;
@@ -13,6 +12,7 @@
1312
import net.minecraft.network.Packet;
1413
import net.minecraft.network.play.server.S35PacketUpdateTileEntity;
1514
import net.minecraft.potion.PotionEffect;
15+
import xreliquary.Reliquary;
1616
import xreliquary.lib.Names;
1717
import xreliquary.lib.Reference;
1818
import xreliquary.util.potions.PotionEssence;
@@ -137,7 +137,7 @@ public void usePestle() {
137137
pestleUsedCounter = 0;
138138
if (worldObj.isRemote)
139139
return;
140-
ItemStack resultItem = new ItemStack(ContentHandler.getItem(Names.potion_essence), 1, 0);
140+
ItemStack resultItem = new ItemStack(Reliquary.CONTENT.getItem(Names.potion_essence), 1, 0);
141141
resultItem.setTagCompound(resultEssence.writeToNBT());
142142

143143

Diff for: ‎src/main/java/xreliquary/client/ClientProxy.java

+3-4
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@
55
import cpw.mods.fml.common.FMLCommonHandler;
66
import cpw.mods.fml.relauncher.Side;
77
import cpw.mods.fml.relauncher.SideOnly;
8-
import lib.enderwizards.sandstone.init.ContentHandler;
98
import net.minecraft.client.renderer.entity.RenderSnowball;
109
import net.minecraft.init.Items;
1110
import net.minecraft.item.ItemBlock;
1211
import net.minecraftforge.client.MinecraftForgeClient;
1312
import net.minecraftforge.common.MinecraftForge;
13+
import xreliquary.Reliquary;
1414
import xreliquary.blocks.tile.TileEntityMortar;
1515
import xreliquary.client.render.*;
1616
import xreliquary.common.CommonProxy;
@@ -19,7 +19,6 @@
1919
import xreliquary.entities.shot.*;
2020
import xreliquary.event.ClientEventHandler;
2121
import xreliquary.lib.Names;
22-
import xreliquary.lib.Reference;
2322

2423
@SideOnly(Side.CLIENT)
2524
public class ClientProxy extends CommonProxy {
@@ -62,8 +61,8 @@ public void registerRenderers() {
6261

6362
ClientRegistry.bindTileEntitySpecialRenderer(TileEntityMortar.class, new RenderApothecaryMortar());
6463

65-
MinecraftForgeClient.registerItemRenderer(ItemBlock.getItemFromBlock(ContentHandler.getBlock(Names.apothecary_mortar)), new ItemRendererApothecaryMortar());
66-
MinecraftForgeClient.registerItemRenderer(ContentHandler.getItem(Names.handgun), new ItemRendererHandgun());
64+
MinecraftForgeClient.registerItemRenderer(ItemBlock.getItemFromBlock(Reliquary.CONTENT.getBlock(Names.apothecary_mortar)), new ItemRendererApothecaryMortar());
65+
MinecraftForgeClient.registerItemRenderer(Reliquary.CONTENT.getItem(Names.handgun), new ItemRendererHandgun());
6766
}
6867

6968
}

Diff for: ‎src/main/java/xreliquary/client/gui/GuiAlkahestTome.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
package xreliquary.client.gui;
22

33
import lib.enderwizards.sandstone.client.gui.GuiBase;
4-
import lib.enderwizards.sandstone.init.ContentHandler;
54
import net.minecraft.init.Blocks;
65
import net.minecraft.init.Items;
76
import net.minecraft.inventory.Container;
87
import net.minecraft.item.ItemStack;
98
import net.minecraft.util.ResourceLocation;
9+
import xreliquary.Reliquary;
1010
import xreliquary.lib.Names;
1111
import xreliquary.lib.Reference;
1212

@@ -31,7 +31,7 @@ protected void drawGuiContainerBackgroundLayer(float f, int i, int j) {
3131
this.drawTexturedModalRect(((this.width - 16) / 2) + 19, ((this.height - 179) / 2) + 148, 0, 180, 10, 10);
3232
this.drawTexturedModalRect(((this.width - 16) / 2) - 14, ((this.height - 179) / 2) + 148, 10, 180, 10, 10);
3333

34-
this.drawItemStack(new ItemStack(ContentHandler.getItem(Names.alkahestry_tome)), (this.width - 16) / 2, ((this.height - 179) / 2) + 145);
34+
this.drawItemStack(new ItemStack(Reliquary.CONTENT.getItem(Names.alkahestry_tome)), (this.width - 16) / 2, ((this.height - 179) / 2) + 145);
3535
this.drawItemStack(new ItemStack(Items.redstone), ((this.width - 16) / 2) - 32, ((this.height - 179) / 2) + 145);
3636
this.drawItemStack(new ItemStack(Blocks.redstone_block), ((this.width - 16) / 2) + 32, ((this.height - 179) / 2) + 145);
3737
}

Diff for: ‎src/main/java/xreliquary/common/CommonProxy.java

+4-5
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
import cpw.mods.fml.common.network.NetworkRegistry;
66
import cpw.mods.fml.common.registry.EntityRegistry;
77
import cpw.mods.fml.common.registry.GameRegistry;
8-
import lib.enderwizards.sandstone.init.ContentHandler;
98
import lib.enderwizards.sandstone.mod.config.ConfigReference;
109
import net.minecraft.entity.EntityList;
1110
import net.minecraft.entity.EntityLiving;
@@ -75,8 +74,8 @@ public void preInit() {
7574

7675

7776
public void init() {
78-
AlkahestryCraftingRecipe.returnedItem = ContentHandler.getItem(Names.alkahestry_tome);
79-
AlkahestryRedstoneRecipe.returnedItem = ContentHandler.getItem(Names.alkahestry_tome);
77+
AlkahestryCraftingRecipe.returnedItem = Reliquary.CONTENT.getItem(Names.alkahestry_tome);
78+
AlkahestryRedstoneRecipe.returnedItem = Reliquary.CONTENT.getItem(Names.alkahestry_tome);
8079

8180
AlkahestryCraftingRecipe alkahestryCraftingRecipeHandler = new AlkahestryCraftingRecipe();
8281
AlkahestryDrainRecipe alkahestryDrainRecipeHandler = new AlkahestryDrainRecipe();
@@ -373,8 +372,8 @@ public void postInit() {
373372

374373
public void initRecipeDisablers() {
375374
//recipe disablers
376-
for (int i = 0; i < ContentHandler.registeredObjectNames.size(); i++) {
377-
Reliquary.CONFIG.require(Names.recipe_enabled, ContentHandler.registeredObjectNames.get(i).replace(':', '_'), new ConfigReference(true));
375+
for (int i = 0; i < Reliquary.CONTENT.registeredObjectNames.size(); i++) {
376+
Reliquary.CONFIG.require(Names.recipe_enabled, Reliquary.CONTENT.registeredObjectNames.get(i).replace(':', '_'), new ConfigReference(true));
378377
}
379378
}
380379

Diff for: ‎src/main/java/xreliquary/entities/EntityLyssaHook.java

+1-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
import cpw.mods.fml.relauncher.Side;
44
import cpw.mods.fml.relauncher.SideOnly;
5-
import lib.enderwizards.sandstone.init.ContentHandler;
65
import net.minecraft.block.Block;
76
import net.minecraft.block.material.Material;
87
import net.minecraft.enchantment.EnchantmentHelper;
@@ -203,7 +202,7 @@ public void onUpdate() {
203202
{
204203
ItemStack itemstack = this.field_146042_b.getCurrentEquippedItem();
205204

206-
if (this.field_146042_b.isDead || !this.field_146042_b.isEntityAlive() || itemstack == null || itemstack.getItem() != ContentHandler.getItem(Names.rod_of_lyssa) || this.getDistanceSqToEntity(this.field_146042_b) > 4096.0D)
205+
if (this.field_146042_b.isDead || !this.field_146042_b.isEntityAlive() || itemstack == null || itemstack.getItem() != Reliquary.CONTENT.getItem(Names.rod_of_lyssa) || this.getDistanceSqToEntity(this.field_146042_b) > 4096.0D)
207206
{
208207
this.setDead();
209208
this.field_146042_b.fishEntity = null;

0 commit comments

Comments
 (0)