From ac4ec1c7bb033641e3a676d77183c5bae74f776d Mon Sep 17 00:00:00 2001 From: TheDarkDnKTv Date: Sun, 25 Apr 2021 00:47:58 +0300 Subject: [PATCH] Changed all items/blocks registry names Now it is impossible to load old worlds since there is new ids. btw, version update --- build.gradle | 2 +- src/main/java/gregtechmod/GT_Mod.java | 14 +- .../loaders/preload/GT_ItemLoader.java | 134 ++++++++++++++++-- src/main/resources/mcmod.info | 2 +- 4 files changed, 131 insertions(+), 21 deletions(-) diff --git a/build.gradle b/build.gradle index 833891a..2761588 100644 --- a/build.gradle +++ b/build.gradle @@ -27,7 +27,7 @@ compileJava { sourceCompatibility = targetCompatibility = '1.8' } -version = "v414.24" +version = "v414.25" group = "gregtechmod" archivesBaseName = "gregtechmod" diff --git a/src/main/java/gregtechmod/GT_Mod.java b/src/main/java/gregtechmod/GT_Mod.java index 9a1bf22..d85eb80 100644 --- a/src/main/java/gregtechmod/GT_Mod.java +++ b/src/main/java/gregtechmod/GT_Mod.java @@ -142,7 +142,7 @@ import cpw.mods.fml.relauncher.Side; /** * @author Gregorius Techneticies */ -@Mod(modid = "gregtech_addon", name="GregTech-Addon", version="4.14.24", useMetadata=false, dependencies="required-after:IC2; after:Railcraft; after:ThermalExpansion; after:ThermalExpansion|Transport; after:ThermalExpansion|Energy; after:ThermalExpansion|Factory; before:RedPowerCore; before:RedPowerBase; before:RedPowerMachine; before:RedPowerCompat; before:RedPowerWiring; before:RedPowerLogic; before:RedPowerLighting; before:RedPowerWorld; before:RedPowerControl;") +@Mod(modid = "gregtech_addon", name="GregTech-Addon", version="4.14.25", useMetadata=false, dependencies="required-after:IC2; after:Railcraft; after:ThermalExpansion; after:ThermalExpansion|Transport; after:ThermalExpansion|Energy; after:ThermalExpansion|Factory; before:RedPowerCore; before:RedPowerBase; before:RedPowerMachine; before:RedPowerCompat; before:RedPowerWiring; before:RedPowerLogic; before:RedPowerLighting; before:RedPowerWorld; before:RedPowerControl;") public class GT_Mod implements IGT_Mod { @Instance public static GT_Mod instance; @@ -443,12 +443,12 @@ public class GT_Mod implements IGT_Mod { } GT_Log.log.info("Adding Blocks."); - GameRegistry.registerBlock(GregTech_API.sBlockList[0] = new GT_BlockMetaID_Block (), GT_MetaBlock_Item.class , GregTech_API.sBlockList[0].getUnlocalizedName()); - GameRegistry.registerBlock(GregTech_API.sBlockList[1] = new GT_BlockMetaID_Machine(), GT_MetaMachine_Item.class , GregTech_API.sBlockList[1].getUnlocalizedName()); - GameRegistry.registerBlock(GregTech_API.sBlockList[2] = new GT_BlockMetaID_Ore (), GT_MetaOre_Item.class , GregTech_API.sBlockList[2].getUnlocalizedName()); - GameRegistry.registerBlock(GregTech_API.sBlockList[3] = new GT_Block_LightSource (), ItemBlock.class , GregTech_API.sBlockList[3].getUnlocalizedName()); - GameRegistry.registerBlock(GregTech_API.sBlockList[4] = new GT_BlockMetaID_Block2 (), GT_MetaBlock2_Item.class , GregTech_API.sBlockList[4].getUnlocalizedName()); - GameRegistry.registerBlock(GregTech_API.sBlockList[5] = new GT_BlockMetaID_Stone1 (), GT_MetaStone1_Item.class , GregTech_API.sBlockList[5].getUnlocalizedName()); + GameRegistry.registerBlock(GregTech_API.sBlockList[0] = new GT_BlockMetaID_Block (), GT_MetaBlock_Item.class , "block"); + GameRegistry.registerBlock(GregTech_API.sBlockList[1] = new GT_BlockMetaID_Machine(), GT_MetaMachine_Item.class , "machine"); + GameRegistry.registerBlock(GregTech_API.sBlockList[2] = new GT_BlockMetaID_Ore (), GT_MetaOre_Item.class , "ore"); + GameRegistry.registerBlock(GregTech_API.sBlockList[3] = new GT_Block_LightSource (), ItemBlock.class , "light_source"); + GameRegistry.registerBlock(GregTech_API.sBlockList[4] = new GT_BlockMetaID_Block2 (), GT_MetaBlock2_Item.class , "block_2"); + GameRegistry.registerBlock(GregTech_API.sBlockList[5] = new GT_BlockMetaID_Stone1 (), GT_MetaStone1_Item.class , "stone"); GregTech_API.registerMachineBlock(GregTech_API.sBlockList[0], new boolean[]{true, true, false, false, false, false, true, false, false, false, true, false, false, true, true, true}); GregTech_API.registerMachineBlock(GregTech_API.sBlockList[1], new boolean[]{true}); diff --git a/src/main/java/gregtechmod/loaders/preload/GT_ItemLoader.java b/src/main/java/gregtechmod/loaders/preload/GT_ItemLoader.java index 5bd004a..2f62cc6 100644 --- a/src/main/java/gregtechmod/loaders/preload/GT_ItemLoader.java +++ b/src/main/java/gregtechmod/loaders/preload/GT_ItemLoader.java @@ -1,8 +1,5 @@ package gregtechmod.loaders.preload; -import java.util.ArrayList; -import java.util.Arrays; - import cpw.mods.fml.common.registry.GameRegistry; import gregtechmod.GT_Mod; @@ -55,7 +52,6 @@ import gregtechmod.common.items.GT_Vanilla_Sword; import net.minecraft.block.material.Material; import net.minecraft.init.Items; import net.minecraft.item.EnumAction; -import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.potion.Potion; @@ -416,15 +412,129 @@ public class GT_ItemLoader implements Runnable { GregTech_API.sItemList[141] = GregTech_API.constructEmptyElectricToolItem("Empty_Screwdriver_Electric", 16, 140); GT_Items.Tool_Hammer_Plastic.set((GregTech_API.sItemList[142] = new GT_SoftHammer_Item("GT_Hammer_Plastic", 1280, 5))); - + GT_Log.log.info("Register items"); - ArrayList gtItems = new ArrayList<>(Arrays.asList(GregTech_API.sItemList)); - gtItems.removeIf(i -> i == null); - for (Item item : GregTech_API.sItemList) { - if (item != null) { - GameRegistry.registerItem(item, item.getUnlocalizedName()); - } - } + GameRegistry.registerItem(GregTech_API.sItemList[ 0], "materials"); + + GameRegistry.registerItem(GregTech_API.sItemList[ 3], "components"); + + GameRegistry.registerItem(GregTech_API.sItemList[ 8], "metaitem_1"); + GameRegistry.registerItem(GregTech_API.sItemList[ 9], "metaitem_2"); + GameRegistry.registerItem(GregTech_API.sItemList[ 10], "integrated_circuit"); + + GameRegistry.registerItem(GregTech_API.sItemList[ 16], "sensor_card"); + GameRegistry.registerItem(GregTech_API.sItemList[ 17], "sensor_kit"); + GameRegistry.registerItem(GregTech_API.sItemList[ 18], "ultimate_cheat_armor"); + + GameRegistry.registerItem(GregTech_API.sItemList[ 30], "iron_mortar"); + GameRegistry.registerItem(GregTech_API.sItemList[ 31], "flint_mortar"); + GameRegistry.registerItem(GregTech_API.sItemList[ 32], "sonictron"); + GameRegistry.registerItem(GregTech_API.sItemList[ 33], "destructopack"); + + GameRegistry.registerItem(GregTech_API.sItemList[ 34], "helium_coolantcell_60"); + GameRegistry.registerItem(GregTech_API.sItemList[ 35], "helium_coolantcell_180"); + GameRegistry.registerItem(GregTech_API.sItemList[ 36], "helium_coolantcell_360"); + + GameRegistry.registerItem(GregTech_API.sItemList[ 38], "cloaking_device"); + GameRegistry.registerItem(GregTech_API.sItemList[ 39], "bronze_jack_hammer"); + GameRegistry.registerItem(GregTech_API.sItemList[ 40], "iridium_neutronreflector"); + GameRegistry.registerItem(GregTech_API.sItemList[ 41], "steel_jack_hammer"); + GameRegistry.registerItem(GregTech_API.sItemList[ 42], "diamond_jack_hammer"); + GameRegistry.registerItem(GregTech_API.sItemList[ 43], "dataorb"); + GameRegistry.registerItem(GregTech_API.sItemList[ 44], "lighthelmet"); + + GameRegistry.registerItem(GregTech_API.sItemList[ 45], "lapotronpack"); + GameRegistry.registerItem(GregTech_API.sItemList[ 46], "rockcutter"); + GameRegistry.registerItem(GregTech_API.sItemList[ 47], "teslastaff"); + GameRegistry.registerItem(GregTech_API.sItemList[ 48], "aluminium_scoop"); + + GameRegistry.registerItem(GregTech_API.sItemList[ 55], "debug_scanner"); + + GameRegistry.registerItem(GregTech_API.sItemList[ 60], "nak_coolantcell_60"); + GameRegistry.registerItem(GregTech_API.sItemList[ 61], "nak_coolantcell_180"); + GameRegistry.registerItem(GregTech_API.sItemList[ 62], "nak_coolantcell_360"); + GameRegistry.registerItem(GregTech_API.sItemList[ 63], "scanner"); + GameRegistry.registerItem(GregTech_API.sItemList[ 64], "crowbar"); + GameRegistry.registerItem(GregTech_API.sItemList[ 65], "screwdriver"); + GameRegistry.registerItem(GregTech_API.sItemList[ 66], "steel_wrench"); + GameRegistry.registerItem(GregTech_API.sItemList[ 67], "iron_wrench"); + GameRegistry.registerItem(GregTech_API.sItemList[ 68], "tungstensteel_wrench"); + GameRegistry.registerItem(GregTech_API.sItemList[ 69], "bronze_wrench"); + GameRegistry.registerItem(GregTech_API.sItemList[ 70], "electric_wrench"); + GameRegistry.registerItem(GregTech_API.sItemList[ 71], "wrench_advanced"); + GameRegistry.registerItem(GregTech_API.sItemList[ 72], "mallet"); + GameRegistry.registerItem(GregTech_API.sItemList[ 73], "iron_hammer"); + GameRegistry.registerItem(GregTech_API.sItemList[ 74], "bronze_hammer"); + GameRegistry.registerItem(GregTech_API.sItemList[ 75], "steel_hammer"); + GameRegistry.registerItem(GregTech_API.sItemList[ 76], "tungstensteel_hammer"); + GameRegistry.registerItem(GregTech_API.sItemList[ 77], "soldering_iron"); + GameRegistry.registerItem(GregTech_API.sItemList[ 78], "solder_tin"); + GameRegistry.registerItem(GregTech_API.sItemList[ 79], "solder_lead"); + GameRegistry.registerItem(GregTech_API.sItemList[ 80], "bronze_turbine"); + GameRegistry.registerItem(GregTech_API.sItemList[ 81], "steel_turbine"); + GameRegistry.registerItem(GregTech_API.sItemList[ 82], "magnalium_turbine"); + GameRegistry.registerItem(GregTech_API.sItemList[ 83], "tungstensteel_turbine"); + GameRegistry.registerItem(GregTech_API.sItemList[ 84], "carbon_turbine"); + GameRegistry.registerItem(GregTech_API.sItemList[ 85], "lava_filter"); + GameRegistry.registerItem(GregTech_API.sItemList[ 86], "iron_file"); + GameRegistry.registerItem(GregTech_API.sItemList[ 87], "bronze_file"); + GameRegistry.registerItem(GregTech_API.sItemList[ 88], "steel_file"); + GameRegistry.registerItem(GregTech_API.sItemList[ 89], "tungstensteel_file"); + GameRegistry.registerItem(GregTech_API.sItemList[ 90], "bug_spray"); + GameRegistry.registerItem(GregTech_API.sItemList[ 91], "ice_spray"); + GameRegistry.registerItem(GregTech_API.sItemList[ 92], "hardener_spray"); + GameRegistry.registerItem(GregTech_API.sItemList[ 93], "foam_spray"); + GameRegistry.registerItem(GregTech_API.sItemList[ 94], "pepper_spray"); + GameRegistry.registerItem(GregTech_API.sItemList[ 95], "hydration_spray"); + + GameRegistry.registerItem(GregTech_API.sItemList[ 96], "black_spray"); + GameRegistry.registerItem(GregTech_API.sItemList[ 97], "red_spray"); // наоборот цвета + GameRegistry.registerItem(GregTech_API.sItemList[ 98], "green_spray"); + GameRegistry.registerItem(GregTech_API.sItemList[ 99], "brown_spray"); + GameRegistry.registerItem(GregTech_API.sItemList[100], "blue_spray"); + GameRegistry.registerItem(GregTech_API.sItemList[101], "purple_spray"); + GameRegistry.registerItem(GregTech_API.sItemList[102], "cyan_spray"); + GameRegistry.registerItem(GregTech_API.sItemList[103], "lightgray_spray"); + GameRegistry.registerItem(GregTech_API.sItemList[104], "gray_spray"); + GameRegistry.registerItem(GregTech_API.sItemList[105], "pink_spray"); + GameRegistry.registerItem(GregTech_API.sItemList[106], "lime_spray"); + GameRegistry.registerItem(GregTech_API.sItemList[107], "yellow_spray"); + GameRegistry.registerItem(GregTech_API.sItemList[108], "lightblue_spray"); + GameRegistry.registerItem(GregTech_API.sItemList[109], "magenta_spray"); + GameRegistry.registerItem(GregTech_API.sItemList[110], "orange_spray"); + GameRegistry.registerItem(GregTech_API.sItemList[111], "white_spray"); + + GameRegistry.registerItem(GregTech_API.sItemList[112], "empty_electric_wrench"); + GameRegistry.registerItem(GregTech_API.sItemList[113], "empty_advanced_wrench"); + GameRegistry.registerItem(GregTech_API.sItemList[114], "empty_soldering_iron"); + GameRegistry.registerItem(GregTech_API.sItemList[115], "iron_saw"); + GameRegistry.registerItem(GregTech_API.sItemList[116], "bronze_saw"); + GameRegistry.registerItem(GregTech_API.sItemList[117], "steel_saw"); + GameRegistry.registerItem(GregTech_API.sItemList[118], "tungstensteel_saw"); + GameRegistry.registerItem(GregTech_API.sItemList[119], "electric_saw"); + GameRegistry.registerItem(GregTech_API.sItemList[120], "advanced_saw"); + GameRegistry.registerItem(GregTech_API.sItemList[121], "empty_electric_Saw"); + GameRegistry.registerItem(GregTech_API.sItemList[122], "empty_advanced_saw"); + GameRegistry.registerItem(GregTech_API.sItemList[123], "advanced_drill"); + GameRegistry.registerItem(GregTech_API.sItemList[124], "flint_sword"); + GameRegistry.registerItem(GregTech_API.sItemList[125], "flint_pickaxe"); + GameRegistry.registerItem(GregTech_API.sItemList[126], "flint_shovel"); + GameRegistry.registerItem(GregTech_API.sItemList[127], "flint_axe"); + GameRegistry.registerItem(GregTech_API.sItemList[128], "flint_hoe"); + GameRegistry.registerItem(GregTech_API.sItemList[129], "steel_sword"); + GameRegistry.registerItem(GregTech_API.sItemList[130], "steel_pickaxe"); + GameRegistry.registerItem(GregTech_API.sItemList[131], "steel_shovel"); + GameRegistry.registerItem(GregTech_API.sItemList[132], "steel_axe"); + GameRegistry.registerItem(GregTech_API.sItemList[133], "steel_hoe"); + GameRegistry.registerItem(GregTech_API.sItemList[134], "tunstensteel_sword"); + GameRegistry.registerItem(GregTech_API.sItemList[135], "tunstensteel_pickaxe"); + GameRegistry.registerItem(GregTech_API.sItemList[136], "tunstensteel_shovel"); + GameRegistry.registerItem(GregTech_API.sItemList[137], "tunstensteel_axe"); + GameRegistry.registerItem(GregTech_API.sItemList[138], "tunstensteel_hoe"); + GameRegistry.registerItem(GregTech_API.sItemList[139], "tungstensteel_screwdriver"); + GameRegistry.registerItem(GregTech_API.sItemList[140], "electric_screwdriver"); + GameRegistry.registerItem(GregTech_API.sItemList[141], "empty_electric_screwdriver"); + GameRegistry.registerItem(GregTech_API.sItemList[142], "plastic_mallet"); GT_Log.log.info("Loading item related stuff"); GT_OreDictUnificator.addToBlacklist(GT_Items.Circuit_Integrated.getWildcard(1)); diff --git a/src/main/resources/mcmod.info b/src/main/resources/mcmod.info index 5741ca5..fa2d12b 100644 --- a/src/main/resources/mcmod.info +++ b/src/main/resources/mcmod.info @@ -3,7 +3,7 @@ "name": "GregTech-Addon", "description": "This Addon adds the awesome Technology of GregTech-Intergalactical to your World! Fusionreactors, Lightningrods and many other Technologies and convenient Recipes are added by this Addon, if you let them enabled in the allmighty Config, of course", "mcversion": "1.7.10", - "version": "4.14.24", + "version": "4.14.25", "logoFile": "/assets/gregtech_addon/textures/LogoGTI_Long.png", "url": "https://github.com/Nukepowered/GregTech4", "updateUrl": "",