diff options
| -rw-r--r-- | libs/gregtech-5.09.32-dev.jar | bin | 17028484 -> 0 bytes | |||
| -rw-r--r-- | src/main/java/common/Recipes.java | 8 | ||||
| -rw-r--r-- | src/main/java/common/tileentities/GTMTE_LapotronicSuperCapacitor.java | 4 | ||||
| -rw-r--r-- | src/main/java/kekztech/KekzCore.java | 2 | ||||
| -rw-r--r-- | src/main/resources/assets/kekztech/lang/en_US.lang | 4 |
5 files changed, 10 insertions, 8 deletions
diff --git a/libs/gregtech-5.09.32-dev.jar b/libs/gregtech-5.09.32-dev.jar Binary files differdeleted file mode 100644 index 44c5cd845f..0000000000 --- a/libs/gregtech-5.09.32-dev.jar +++ /dev/null diff --git a/src/main/java/common/Recipes.java b/src/main/java/common/Recipes.java index 2c83beae5c..1ae43cb63f 100644 --- a/src/main/java/common/Recipes.java +++ b/src/main/java/common/Recipes.java @@ -490,10 +490,10 @@ public class Recipes { } else if(GT_Utility.areStacksEqual(ar.mOutput, ItemList.Energy_Cluster.get(1L), true)) { // UV Lapo Orb arUV = ar; - } else if(GT_Utility.areStacksEqual(GT_ModHandler.getModItem("gregtech", "gt.metaitem.01", 1, 32605), ar.mOutput, true)) { + } else if(GT_Utility.areStacksEqual(ar.mOutput, ItemList.ZPM2.get(1L), true)) { // Ultimate Battery arU = ar; - } else if(GT_Utility.areStacksEqual(GT_ModHandler.getModItem("gregtech", "metaitem.01", 1, 32609), ar.mOutput, true)) { + } else if(GT_Utility.areStacksEqual(ar.mOutput, ItemList.ZPM3.get(1L), true)) { // Really Ultimate Battery arRU = ar; } @@ -532,11 +532,11 @@ public class Recipes { GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Neutronium, 24), 1200, 32); GT_Values.RA.addUnboxingRecipe(new ItemStack(Blocks.lscLapotronicEnergyUnit, 1, 1), - ItemList.Energy_LapotronicOrb.get(1L), + ItemList.ZPM2.get(1L), GT_OreDictUnificator.get(OrePrefixes.screw, Materials.CosmicNeutronium, 24), 1200, 32); GT_Values.RA.addUnboxingRecipe(new ItemStack(Blocks.lscLapotronicEnergyUnit, 1, 1), - ItemList.Energy_LapotronicOrb.get(1L), + ItemList.ZPM3.get(1L), GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Infinity, 24), 1200, 32); } diff --git a/src/main/java/common/tileentities/GTMTE_LapotronicSuperCapacitor.java b/src/main/java/common/tileentities/GTMTE_LapotronicSuperCapacitor.java index a8341e3118..085659caef 100644 --- a/src/main/java/common/tileentities/GTMTE_LapotronicSuperCapacitor.java +++ b/src/main/java/common/tileentities/GTMTE_LapotronicSuperCapacitor.java @@ -279,9 +279,9 @@ public class GTMTE_LapotronicSuperCapacitor extends GT_MetaTileEntity_MultiBlock final int colourCorrectedMeta = firstGlassMeta > 5 ? 0 : firstGlassMeta; for(int highestCapacitor = capacitors.length - 1; highestCapacitor >= 0; highestCapacitor--){ if(capacitors[highestCapacitor] > 0){ - if(!(colourCorrectedMeta >= capacitors[highestCapacitor])){ + if(colourCorrectedMeta < highestCapacitor){ formationChecklist = false; - KekzCore.LOGGER.info("LSC Glass is not of correct tier"); + KekzCore.LOGGER.info("LSC Glass is not of high enough tier"); KekzCore.LOGGER.info("Highest capacitor tier (0 is IV): " + highestCapacitor); KekzCore.LOGGER.info("Glass tier (0 is HV): " +colourCorrectedMeta); } diff --git a/src/main/java/kekztech/KekzCore.java b/src/main/java/kekztech/KekzCore.java index e0d7387713..4e49197b65 100644 --- a/src/main/java/kekztech/KekzCore.java +++ b/src/main/java/kekztech/KekzCore.java @@ -123,7 +123,7 @@ public class KekzCore { .add(Aspect.VOID, 5);
final ResearchItem jar_ichor = new ResearchItem("ICHORJAR", "ALCHEMY", aspects_jarichor, 2, -5, 3, new ItemStack(Blocks.jarIchor, 1))
.setPages(
- new ResearchPage("kekztech.research_page.ICHORJAR"),
+ new ResearchPage("kekztech.research_page.ICHORJAR.0"),
new ResearchPage(Recipes.infusionRecipes.get("ICHORJAR"))
)
.setConcealed()
diff --git a/src/main/resources/assets/kekztech/lang/en_US.lang b/src/main/resources/assets/kekztech/lang/en_US.lang index d21a9b0982..c756cbb045 100644 --- a/src/main/resources/assets/kekztech/lang/en_US.lang +++ b/src/main/resources/assets/kekztech/lang/en_US.lang @@ -109,10 +109,12 @@ item.kekztech_ichorjarfilled_item.name=Ichor Jar with Essentia item.kekztech_ichorjarfilled_item.void.name=Ichor Void Jar with Essentia
tc.research_name.THAUMIUMREINFORCEDJAR=Thaumium Reinforced Jars
+kekztech.research_page.THAUMIUMREINFORCEDJAR=Slightly better jars
kekztech.research_page.THAUMIUMREINFORCEDJAR.0=You have heard your fellow Thaumaturges talk about the benefits of digitized Essentia Storage.<BR><BR>Storing enough Essentia for your advanced infusions has indeed been an issue for you too. However those jars are simply too pleasing to look at to even consider the idea of replacing them with some compact technological construct.<BR><BR>Thanks to this new discovery, you have managed to quadruple the capacity of your jars by improving them with a thick Thaumium lining. This should buy you some more time to come up with a better solution.
kekztech.research_page.THAUMIUMREINFORCEDJAR.1=Compressing this much Essentia in such a tiny space causes some volatility. Picking up reinforced jars is probably a bad idea...<BR><BR>You imagine that you could get even more out of your jars if only you had some kind of material harder than even diamond or any of the other magical metal you have seen so far.
tc.research_name.ICHORJAR=Ichor Jars
-kekztech.research_page.ICHORJAR=This is it!<BR><BR>By infusing a jar with just a single piece of Ichor you have created something to rival digitized Essentia storage without sacrificing any of the beauty of Warded Jars.<BR><BR>Ichor Jars can hold an astounding 4096 Essentia and fit nicely into your recently aquired set of Ichor based achievements.<BR><BR>You definitely don't want to disturb these jars. Luckily Ichor is resilient enough to make accidentially destroying one unlikely.
+kekztech.research_page.ICHORJAR=Much better jars
+kekztech.research_page.ICHORJAR.0=This is it!<BR><BR>By infusing a jar with just a single piece of Ichor you have created something to rival digitized Essentia storage without sacrificing any of the beauty of Warded Jars.<BR><BR>Ichor Jars can hold an astounding 4096 Essentia and fit nicely into your recently aquired set of Ichor based achievements.<BR><BR>You definitely don't want to disturb these jars. Luckily Ichor is resilient enough to make accidentially destroying one unlikely.
tile.kekztech_lapotronicenergyunit_block.0.name=Lapotronic Super Capacitor Casing
tile.kekztech_lapotronicenergyunit_block.1.name=Lapotronic Capacitor (IV)
|