diff options
| author | chochem <40274384+chochem@users.noreply.github.com> | 2024-08-04 22:10:44 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-08-04 22:10:44 +0100 |
| commit | bab2cbe2d7300cf5f95f4608db44290d18a734f9 (patch) | |
| tree | 4ba4fe6537399ac437b0fd11131659af483d47e8 /src/main/java/gregtech/loaders | |
| parent | 907324944ed39caa24ecb8ff5337af0e8b8706ea (diff) | |
| download | GT5-Unofficial-bab2cbe2d7300cf5f95f4608db44290d18a734f9.tar.gz GT5-Unofficial-bab2cbe2d7300cf5f95f4608db44290d18a734f9.tar.bz2 GT5-Unofficial-bab2cbe2d7300cf5f95f4608db44290d18a734f9.zip | |
Battery tier fixes (#2825)
* fix battery oredicts
* fix more battery tiers
Diffstat (limited to 'src/main/java/gregtech/loaders')
3 files changed, 8 insertions, 8 deletions
diff --git a/src/main/java/gregtech/loaders/load/GT_Loader_MetaTileEntities_Recipes.java b/src/main/java/gregtech/loaders/load/GT_Loader_MetaTileEntities_Recipes.java index 745546401b..b77685cf18 100644 --- a/src/main/java/gregtech/loaders/load/GT_Loader_MetaTileEntities_Recipes.java +++ b/src/main/java/gregtech/loaders/load/GT_Loader_MetaTileEntities_Recipes.java @@ -5726,25 +5726,25 @@ public class GT_Loader_MetaTileEntities_Recipes implements Runnable { bitsd, new Object[] { aTextWireChest, aTextWireHull, "BCB", 'M', ItemList.Hull_EV, 'W', OrePrefixes.wireGt16.get(Materials.Aluminium), 'T', OreDictNames.craftingChest, 'B', - OrePrefixes.battery.get(Materials.LuV), 'C', OrePrefixes.circuit.get(Materials.EV) }); + OrePrefixes.battery.get(Materials.EV), 'C', OrePrefixes.circuit.get(Materials.EV) }); GT_ModHandler.addCraftingRecipe( ItemList.Battery_Charger_4by4_IV.get(1L), bitsd, new Object[] { aTextWireChest, aTextWireHull, "BCB", 'M', ItemList.Hull_IV, 'W', OrePrefixes.wireGt16.get(Materials.Tungsten), 'T', OreDictNames.craftingChest, 'B', - ItemList.Energy_LapotronicOrb, 'C', OrePrefixes.circuit.get(Materials.IV) }); + OrePrefixes.battery.get(Materials.IV), 'C', OrePrefixes.circuit.get(Materials.IV) }); GT_ModHandler.addCraftingRecipe( ItemList.Battery_Charger_4by4_LuV.get(1L), bitsd, new Object[] { aTextWireChest, aTextWireHull, "BCB", 'M', ItemList.Hull_LuV, 'W', OrePrefixes.wireGt16.get(Materials.VanadiumGallium), 'T', OreDictNames.craftingChest, 'B', - ItemList.Energy_LapotronicOrb2, 'C', OrePrefixes.circuit.get(Materials.LuV) }); + OrePrefixes.battery.get(Materials.LuV), 'C', OrePrefixes.circuit.get(Materials.LuV) }); GT_ModHandler.addCraftingRecipe( ItemList.Battery_Charger_4by4_ZPM.get(1L), bitsd, new Object[] { aTextWireChest, aTextWireHull, "BCB", 'M', ItemList.Hull_ZPM, 'W', OrePrefixes.wireGt16.get(Materials.Naquadah), 'T', OreDictNames.craftingChest, 'B', - ItemList.Energy_LapotronicOrb2, 'C', OrePrefixes.circuit.get(Materials.ZPM) }); + OrePrefixes.battery.get(Materials.ZPM), 'C', OrePrefixes.circuit.get(Materials.ZPM) }); GT_ModHandler.addCraftingRecipe( ItemList.Battery_Charger_4by4_UV.get(1L), bitsd, diff --git a/src/main/java/gregtech/loaders/postload/GT_CraftingRecipeLoader.java b/src/main/java/gregtech/loaders/postload/GT_CraftingRecipeLoader.java index f32ee74319..216c659be7 100644 --- a/src/main/java/gregtech/loaders/postload/GT_CraftingRecipeLoader.java +++ b/src/main/java/gregtech/loaders/postload/GT_CraftingRecipeLoader.java @@ -1953,7 +1953,7 @@ public class GT_CraftingRecipeLoader implements Runnable { GT_ModHandler.addCraftingRecipe( GT_ModHandler.getIC2Item("nanoSaber", 1L), bits_no_remove_buffered, - new Object[] { "PI ", "PI ", "CLC", 'L', OrePrefixes.battery.get(Materials.LuV), 'I', + new Object[] { "PI ", "PI ", "CLC", 'L', OrePrefixes.battery.get(Materials.EV), 'I', OrePrefixes.plateAlloy.get("Iridium"), 'P', OrePrefixes.plate.get(Materials.Platinum), 'C', OrePrefixes.circuit.get(Materials.IV) }); diff --git a/src/main/java/gregtech/loaders/preload/GT_Loader_OreDictionary.java b/src/main/java/gregtech/loaders/preload/GT_Loader_OreDictionary.java index c583da068d..1b4d2bdf91 100644 --- a/src/main/java/gregtech/loaders/preload/GT_Loader_OreDictionary.java +++ b/src/main/java/gregtech/loaders/preload/GT_Loader_OreDictionary.java @@ -172,11 +172,11 @@ public class GT_Loader_OreDictionary implements Runnable { GT_OreDictUnificator .registerOre(OrePrefixes.battery, Materials.LV, GT_ModHandler.getIC2Item("chargedReBattery", 1L, 32767)); GT_OreDictUnificator - .registerOre(OrePrefixes.battery, Materials.HV, GT_ModHandler.getIC2Item("advBattery", 1L, 32767)); + .registerOre(OrePrefixes.battery, Materials.MV, GT_ModHandler.getIC2Item("advBattery", 1L, 32767)); GT_OreDictUnificator - .registerOre(OrePrefixes.battery, Materials.EV, GT_ModHandler.getIC2Item("energyCrystal", 1L, 32767)); + .registerOre(OrePrefixes.battery, Materials.HV, GT_ModHandler.getIC2Item("energyCrystal", 1L, 32767)); GT_OreDictUnificator - .registerOre(OrePrefixes.battery, Materials.IV, GT_ModHandler.getIC2Item("lapotronCrystal", 1L, 32767)); + .registerOre(OrePrefixes.battery, Materials.EV, GT_ModHandler.getIC2Item("lapotronCrystal", 1L, 32767)); GT_OreDictUnificator .registerOre(OreDictNames.craftingWireCopper, GT_ModHandler.getIC2Item("insulatedCopperCableItem", 1L)); |