diff --git a/src/main/java/tconstruct/plugins/buildcraft/BuildcraftTransport.java b/src/main/java/tconstruct/plugins/buildcraft/BuildcraftTransport.java index 17641ac6..1289b994 100644 --- a/src/main/java/tconstruct/plugins/buildcraft/BuildcraftTransport.java +++ b/src/main/java/tconstruct/plugins/buildcraft/BuildcraftTransport.java @@ -2,7 +2,7 @@ package tconstruct.plugins.buildcraft; import cpw.mods.fml.common.event.FMLInterModComms; import tconstruct.TConstruct; -import tconstruct.common.TContent; +import tconstruct.common.TRepo; import tconstruct.plugins.ICompatPlugin; public class BuildcraftTransport implements ICompatPlugin { @@ -21,42 +21,42 @@ public class BuildcraftTransport implements ICompatPlugin { public void init() { TConstruct.logger.info("[BC|Transport] Registering facades."); // Smeltery Blocks - addFacade(TContent.smeltery.blockID, 2); + addFacade(TRepo.smeltery.blockID, 2); for (int sc = 4; sc < 11; sc++) { - addFacade(TContent.smeltery.blockID, sc); + addFacade(TRepo.smeltery.blockID, sc); } // Multi Brick + Fancy for (int sc = 0; sc < 13; sc++) { - addFacade(TContent.multiBrick.blockID, sc); + addFacade(TRepo.multiBrick.blockID, sc); } for (int sc = 0; sc < 16; sc++) { - addFacade(TContent.multiBrickFancy.blockID, sc); + addFacade(TRepo.multiBrickFancy.blockID, sc); } // Special Soil for (int sc = 0; sc < 6; sc++) { - addFacade(TContent.craftedSoil.blockID, sc); + addFacade(TRepo.craftedSoil.blockID, sc); } // Metal Storage for (int sc = 0; sc < 11; sc++) { - addFacade(TContent.metalBlock.blockID, sc); + addFacade(TRepo.metalBlock.blockID, sc); } // Speed Block for (int sc = 0; sc < 7; sc++) { - addFacade(TContent.speedBlock.blockID, sc); + addFacade(TRepo.speedBlock.blockID, sc); } // Hambone - addFacade(TContent.meatBlock.blockID, 4); - addFacade(TContent.meatBlock.blockID, 8); + addFacade(TRepo.meatBlock.blockID, 4); + addFacade(TRepo.meatBlock.blockID, 8); // Slime Gel - addFacade(TContent.slimeGel.blockID, 0); - addFacade(TContent.slimeGel.blockID, 1); + addFacade(TRepo.slimeGel.blockID, 0); + addFacade(TRepo.slimeGel.blockID, 1); } @Override diff --git a/src/main/java/tconstruct/plugins/fmp/ForgeMultiPart.java b/src/main/java/tconstruct/plugins/fmp/ForgeMultiPart.java index aaf3e528..18ed706a 100644 --- a/src/main/java/tconstruct/plugins/fmp/ForgeMultiPart.java +++ b/src/main/java/tconstruct/plugins/fmp/ForgeMultiPart.java @@ -1,7 +1,7 @@ package tconstruct.plugins.fmp; import tconstruct.TConstruct; -import tconstruct.common.TContent; +import tconstruct.common.TRepo; import tconstruct.plugins.ICompatPlugin; import tconstruct.plugins.fmp.register.RegisterWithFMP; @@ -21,13 +21,13 @@ public class ForgeMultiPart implements ICompatPlugin public void init() { TConstruct.logger.info("ForgeMultipart detected. Registering TConstruct decorative blocks with FMP."); - RegisterWithFMP.registerBlock(TContent.clearGlass); - RegisterWithFMP.registerBlock(TContent.stainedGlassClear, 0, 15); - RegisterWithFMP.registerBlock(TContent.multiBrick, 0, 13); - RegisterWithFMP.registerBlock(TContent.metalBlock, 0, 10); - RegisterWithFMP.registerBlock(TContent.multiBrickFancy, 0, 15); - RegisterWithFMP.registerBlock(TContent.smeltery, 2, 2); - RegisterWithFMP.registerBlock(TContent.smeltery, 4, 10); + RegisterWithFMP.registerBlock(TRepo.clearGlass); + RegisterWithFMP.registerBlock(TRepo.stainedGlassClear, 0, 15); + RegisterWithFMP.registerBlock(TRepo.multiBrick, 0, 13); + RegisterWithFMP.registerBlock(TRepo.metalBlock, 0, 10); + RegisterWithFMP.registerBlock(TRepo.multiBrickFancy, 0, 15); + RegisterWithFMP.registerBlock(TRepo.smeltery, 2, 2); + RegisterWithFMP.registerBlock(TRepo.smeltery, 4, 10); } @Override diff --git a/src/main/java/tconstruct/plugins/minefactoryreloaded/harvestables/GrindableHorse.java b/src/main/java/tconstruct/plugins/minefactoryreloaded/harvestables/GrindableHorse.java index 327240e7..558e24d0 100644 --- a/src/main/java/tconstruct/plugins/minefactoryreloaded/harvestables/GrindableHorse.java +++ b/src/main/java/tconstruct/plugins/minefactoryreloaded/harvestables/GrindableHorse.java @@ -10,7 +10,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.world.World; import powercrystals.minefactoryreloaded.api.IFactoryGrindable; import powercrystals.minefactoryreloaded.api.MobDrop; -import tconstruct.common.TContent; +import tconstruct.common.TRepo; public class GrindableHorse implements IFactoryGrindable { @@ -25,7 +25,7 @@ public class GrindableHorse implements IFactoryGrindable { List drops = new ArrayList(); - drops.add(new MobDrop(10, new ItemStack(TContent.materials, random.nextInt(4) + 1, 36))); + drops.add(new MobDrop(10, new ItemStack(TRepo.materials, random.nextInt(4) + 1, 36))); return drops; } diff --git a/src/main/java/tconstruct/plugins/minefactoryreloaded/mfrRegistering.java b/src/main/java/tconstruct/plugins/minefactoryreloaded/mfrRegistering.java index 2266e6d0..d776eefa 100644 --- a/src/main/java/tconstruct/plugins/minefactoryreloaded/mfrRegistering.java +++ b/src/main/java/tconstruct/plugins/minefactoryreloaded/mfrRegistering.java @@ -1,7 +1,7 @@ package tconstruct.plugins.minefactoryreloaded; import powercrystals.minefactoryreloaded.api.FactoryRegistry; -import tconstruct.common.TContent; +import tconstruct.common.TRepo; import tconstruct.plugins.minefactoryreloaded.drinkable.Drinkables; import tconstruct.plugins.minefactoryreloaded.harvestables.GrindableHorse; import tconstruct.plugins.minefactoryreloaded.harvestables.HarvestableOreBerry; @@ -10,9 +10,9 @@ public class mfrRegistering { public static void registerWithMFR () { - FactoryRegistry.registerHarvestable(new HarvestableOreBerry(TContent.oreBerry.blockID, TContent.oreBerries.itemID, 0)); - FactoryRegistry.registerHarvestable(new HarvestableOreBerry(TContent.oreBerrySecond.blockID, TContent.oreBerries.itemID, 4)); + FactoryRegistry.registerHarvestable(new HarvestableOreBerry(TRepo.oreBerry.blockID, TRepo.oreBerries.itemID, 0)); + FactoryRegistry.registerHarvestable(new HarvestableOreBerry(TRepo.oreBerrySecond.blockID, TRepo.oreBerries.itemID, 4)); FactoryRegistry.registerGrindable(new GrindableHorse()); - FactoryRegistry.registerLiquidDrinkHandler(TContent.bloodFluid.getName(), new Drinkables()); + FactoryRegistry.registerLiquidDrinkHandler(TRepo.bloodFluid.getName(), new Drinkables()); } } diff --git a/src/main/java/tconstruct/plugins/thaumcraft/Thaumcraft.java b/src/main/java/tconstruct/plugins/thaumcraft/Thaumcraft.java index fd024d9f..83cfe197 100644 --- a/src/main/java/tconstruct/plugins/thaumcraft/Thaumcraft.java +++ b/src/main/java/tconstruct/plugins/thaumcraft/Thaumcraft.java @@ -3,7 +3,7 @@ package tconstruct.plugins.thaumcraft; import cpw.mods.fml.common.event.FMLInterModComms; import net.minecraft.item.ItemStack; import tconstruct.TConstruct; -import tconstruct.common.TContent; +import tconstruct.common.TRepo; import tconstruct.plugins.ICompatPlugin; public class Thaumcraft implements ICompatPlugin { @@ -21,12 +21,12 @@ public class Thaumcraft implements ICompatPlugin { @Override public void init() { TConstruct.logger.info("[Thaumcraft] Registering harvestables."); - FMLInterModComms.sendMessage("Thaumcraft", "harvestClickableCrop", new ItemStack(TContent.oreBerry, 1, 12)); - FMLInterModComms.sendMessage("Thaumcraft", "harvestClickableCrop", new ItemStack(TContent.oreBerry, 1, 13)); - FMLInterModComms.sendMessage("Thaumcraft", "harvestClickableCrop", new ItemStack(TContent.oreBerry, 1, 14)); - FMLInterModComms.sendMessage("Thaumcraft", "harvestClickableCrop", new ItemStack(TContent.oreBerry, 1, 15)); - FMLInterModComms.sendMessage("Thaumcraft", "harvestClickableCrop", new ItemStack(TContent.oreBerrySecond, 1, 12)); - FMLInterModComms.sendMessage("Thaumcraft", "harvestClickableCrop", new ItemStack(TContent.oreBerrySecond, 1, 13)); + FMLInterModComms.sendMessage("Thaumcraft", "harvestClickableCrop", new ItemStack(TRepo.oreBerry, 1, 12)); + FMLInterModComms.sendMessage("Thaumcraft", "harvestClickableCrop", new ItemStack(TRepo.oreBerry, 1, 13)); + FMLInterModComms.sendMessage("Thaumcraft", "harvestClickableCrop", new ItemStack(TRepo.oreBerry, 1, 14)); + FMLInterModComms.sendMessage("Thaumcraft", "harvestClickableCrop", new ItemStack(TRepo.oreBerry, 1, 15)); + FMLInterModComms.sendMessage("Thaumcraft", "harvestClickableCrop", new ItemStack(TRepo.oreBerrySecond, 1, 12)); + FMLInterModComms.sendMessage("Thaumcraft", "harvestClickableCrop", new ItemStack(TRepo.oreBerrySecond, 1, 13)); } @Override