diff options
Diffstat (limited to 'src/main')
3 files changed, 19 insertions, 27 deletions
diff --git a/src/main/java/goodgenerator/blocks/tileEntity/LargeEssentiaGenerator.java b/src/main/java/goodgenerator/blocks/tileEntity/LargeEssentiaGenerator.java index 1c3cc80602..b7195521a3 100644 --- a/src/main/java/goodgenerator/blocks/tileEntity/LargeEssentiaGenerator.java +++ b/src/main/java/goodgenerator/blocks/tileEntity/LargeEssentiaGenerator.java @@ -166,25 +166,25 @@ public class LargeEssentiaGenerator extends GT_MetaTileEntity_MultiblockBase_EM 'E', ofChain( onElementPass( - x -> {++x.mStableValue; x.mTierLimit = Math.max(x.mTierLimit, 3);}, + x -> {++x.mStableValue; x.mTierLimit = Math.max(x.mTierLimit, 4);}, ofBlock( Loaders.essentiaCell, 0 ) ), onElementPass( - x -> {x.mStableValue += 2; x.mTierLimit = Math.max(x.mTierLimit, 4);}, + x -> {x.mStableValue += 2; x.mTierLimit = Math.max(x.mTierLimit, 5);}, ofBlock( Loaders.essentiaCell, 1 ) ), onElementPass( - x -> {x.mStableValue += 5; x.mTierLimit = Math.max(x.mTierLimit, 5);}, + x -> {x.mStableValue += 5; x.mTierLimit = Math.max(x.mTierLimit, 6);}, ofBlock( Loaders.essentiaCell, 2 ) ), onElementPass( - x -> {x.mStableValue += 10; x.mTierLimit = Math.max(x.mTierLimit, 6);}, + x -> {x.mStableValue += 10; x.mTierLimit = Math.max(x.mTierLimit, 7);}, ofBlock( Loaders.essentiaCell, 3 ) diff --git a/src/main/java/goodgenerator/crossmod/thaumcraft/Research.java b/src/main/java/goodgenerator/crossmod/thaumcraft/Research.java index 123223872e..72b6918521 100644 --- a/src/main/java/goodgenerator/crossmod/thaumcraft/Research.java +++ b/src/main/java/goodgenerator/crossmod/thaumcraft/Research.java @@ -140,7 +140,7 @@ public class Research{ "And higher efficiency.", new String[]{"ESSENTIA_GENERATOR"}, "ARTIFICE", - ItemRefer.Essentia_Cell_T3.get(1), + ItemRefer.Essentia_Cell_T4.get(1), 2, 0, -10, 3, Arrays.asList( new TC_Aspects.TC_AspectStack(TC_Aspects.AQUA, 10L), @@ -156,12 +156,12 @@ public class Research{ "ESSENTIA_CELL", ItemRefer.Essentia_Cell_T1.get(1), new ItemStack[]{ - GT_OreDictUnificator.get(OrePrefixes.pipeTiny, Materials.TungstenSteel, 1), - ItemList.FluidRegulator_EV.get(1L), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Iridium, 1), + ItemList.Electric_Pump_IV.get(1L), ItemList.QuantumStar.get(1L), - new ItemStack(ConfigBlocks.blockJar, 1, 0), - GT_OreDictUnificator.get(OrePrefixes.spring, Materials.Platinum, 1), - GT_OreDictUnificator.get(OrePrefixes.gearGt, Materials.Desh, 1) + new ItemStack(ConfigBlocks.blockMetalDevice, 1, 3), + ItemList.Reactor_Coolant_Sp_1.get(1L), + GT_OreDictUnificator.get(OrePrefixes.bolt, Materials.Plutonium241, 1), }, ItemRefer.Essentia_Cell_T2.get(1), 6, @@ -175,16 +175,12 @@ public class Research{ "ESSENTIA_CELL", ItemRefer.Essentia_Cell_T2.get(1), new ItemStack[]{ - GT_OreDictUnificator.get(OrePrefixes.pipeTiny, Materials.NiobiumTitanium, 1), ItemList.Field_Generator_IV.get(1L), - ItemList.Reactor_Coolant_Sp_3.get(1L), + ItemList.Electric_Pump_LuV.get(1L), new ItemStack(ConfigItems.itemResource,1,14), Ic2Items.fluidregulator, - new ItemStack(ConfigBlocks.blockCrystal, 1, 6), - GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Plutonium241, 1), - GT_OreDictUnificator.get(OrePrefixes.gearGt, Materials.Void, 1), - GT_OreDictUnificator.get(OrePrefixes.lens, Materials.EnderEye, 1), - new ItemStack(ConfigBlocks.blockMetalDevice, 1, 3) + new ItemStack(ConfigBlocks.blockJar, 1, 0), + GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.Ichorium, 1) }, ItemRefer.Essentia_Cell_T3.get(1), 8, @@ -198,16 +194,12 @@ public class Research{ "ESSENTIA_CELL", ItemRefer.Essentia_Cell_T3.get(1), new ItemStack[]{ - GT_OreDictUnificator.get(OrePrefixes.pipeTiny, Materials.Europium, 1), + GT_OreDictUnificator.get(OrePrefixes.ring, Materials.Europium, 1), ItemList.Emitter_LuV.get(1L), - ItemList.FluidRegulator_LuV.get(1L), - new ItemStack(ConfigItems.itemEldritchObject,1,3), - new ItemStack(ItemRegistry.bw_realglas, 1, 3), - GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Indium, 1), - GT_OreDictUnificator.get(OrePrefixes.gearGt, Materials.Ichorium, 1), - GT_OreDictUnificator.get(OrePrefixes.spring, Materials.Quantium, 1), - GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.Sunnarium, 1), - MyMaterial.orundum.get(OrePrefixes.gemExquisite, 1) + new ItemStack(ItemRegistry.bw_realglas, 1, 4), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.StellarAlloy, 1), + GT_OreDictUnificator.get(OrePrefixes.cellPlasma, Materials.Helium, 1), + new ItemStack(ConfigItems.itemShard,1,6), }, ItemRefer.Essentia_Cell_T4.get(1), 10, diff --git a/src/main/java/goodgenerator/items/MyItemBlocks.java b/src/main/java/goodgenerator/items/MyItemBlocks.java index 2136c6a9c4..d1b4bbe4ec 100644 --- a/src/main/java/goodgenerator/items/MyItemBlocks.java +++ b/src/main/java/goodgenerator/items/MyItemBlocks.java @@ -83,7 +83,7 @@ public class MyItemBlocks extends ItemBlock { } if (Block.getBlockFromItem(p_77624_1_.getItem()).equals(essentiaCell)) { - p_77624_3_.add(StatCollector.translateToLocal("hatchTier.tooltip.0") + " " + tierName[p_77624_1_.getItemDamage() + 3]); + p_77624_3_.add(StatCollector.translateToLocal("hatchTier.tooltip.0") + " " + tierName[p_77624_1_.getItemDamage() + 4]); } } } |