diff options
| author | kekzdealer <kekzdealer@gmail.com> | 2020-05-11 20:30:17 +0200 |
|---|---|---|
| committer | kekzdealer <kekzdealer@gmail.com> | 2020-05-11 20:30:17 +0200 |
| commit | a19cd4e211ee2ec684f940ea6d4d974e4136385c (patch) | |
| tree | 926330659ecf4467731c0eecf45400f51eefb30c /src/main/java | |
| parent | 5923da0b36c10fcd0cbfa183f8eb76ab36130d31 (diff) | |
| download | GT5-Unofficial-a19cd4e211ee2ec684f940ea6d4d974e4136385c.tar.gz GT5-Unofficial-a19cd4e211ee2ec684f940ea6d4d974e4136385c.tar.bz2 GT5-Unofficial-a19cd4e211ee2ec684f940ea6d4d974e4136385c.zip | |
Another attempt at checkMachine() fix :T. Tried to add research text to research notes (the handheld item)
Diffstat (limited to 'src/main/java')
| -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 |
3 files changed, 7 insertions, 7 deletions
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()
|