Skip to content

Commit d0db103

Browse files
tier940tier940
committed
fix
1 parent 27589e4 commit d0db103

File tree

14 files changed

+63
-177
lines changed

14 files changed

+63
-177
lines changed

‎libs/GregicalityMultiblocks-1.3.0-dev.jar‎

953 Bytes
Binary file not shown.

‎src/main/java/gtexpert/common/GTEConfigHolder.java‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -68,10 +68,6 @@ public static class GTEFeatureFlag {
6868
@Config.Comment({ "Activate items under development.",
6969
"Default: false" })
7070
public boolean previewItems = false;
71-
72-
@Config.Comment({ "Items and machines are re-numbered.",
73-
"Default: false" })
74-
public boolean newId = false;
7571
}
7672

7773
public static class GregtechOverride {

‎src/main/java/gtexpert/common/items/GTEMetaItem1.java‎

Lines changed: 28 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -22,76 +22,62 @@ public GTEMetaItem1() {
2222

2323
@Override
2424
public void registerSubItems() {
25-
int metaStartId = 0;
26-
27-
if (GTEConfigHolder.gteFeatureFlag.previewItems) {
28-
GTE_LOGO = addItem(metaStartId, "logo");
29-
GTE_ME_FAKE_COMPONENT = addItem(metaStartId += 1, "gte_me_fake_component");
30-
} else {
31-
GTE_ME_FAKE_COMPONENT = addItem(metaStartId, "gte_me_fake_component");
32-
}
33-
34-
// Matrix core
35-
MATRIX_CORE = addItem(metaStartId += 1, "matrix_core");
25+
GTE_ME_FAKE_COMPONENT = addItem(0, "gte_me_fake_component");
26+
MATRIX_CORE = addItem(1, "matrix_core");
3627

3728
// Artificial bone
38-
ARTIFICIAL_BONE = addItem(metaStartId + 1, "artificial_bone");
29+
ARTIFICIAL_BONE = addItem(2, "artificial_bone");
3930

40-
// Free range: ID 3-10
31+
// Free range: ID 4-10
32+
GTE_LOGO = addItem(3, "logo");
4133

42-
// Primitive parts
43-
metaStartId = 11;
34+
// Primitive parts: ID 11-20
4435
String componentsName = GTEConfigHolder.gteFlag.componentsName ? "ulv" : "primitive";
45-
GTE_ELECTRIC_MOTOR = addItem(metaStartId, "electric.motor." + componentsName);
46-
GTE_ELECTRIC_PUMP = addItem(metaStartId += 1, "electric.pump." + componentsName)
36+
GTE_ELECTRIC_MOTOR = addItem(11, "electric.motor." + componentsName);
37+
GTE_ELECTRIC_PUMP = addItem(12, "electric.pump." + componentsName)
4738
.addComponents(new TooltipBehavior(lines -> {
4839
lines.add(I18n.format("metaitem.electric.pump.tooltip"));
4940
lines.add(I18n.format("gregtech.universal.tooltip.fluid_transfer_rate", (1280 / 4) / 20));
5041
}));
51-
GTE_CONVEYOR_MODULE = addItem(metaStartId += 1, "conveyor.module." + componentsName)
42+
GTE_CONVEYOR_MODULE = addItem(13, "conveyor.module." + componentsName)
5243
.addComponents(new TooltipBehavior(lines -> {
5344
lines.add(I18n.format("metaitem.conveyor.module.tooltip"));
5445
lines.add(I18n.format("gregtech.universal.tooltip.item_transfer_rate", 2));
5546
}));
56-
GTE_ELECTRIC_PISTON = addItem(metaStartId += 1, "electric.piston." + componentsName);
57-
GTE_ROBOT_ARM = addItem(metaStartId += 1, "robot.arm." + componentsName)
47+
GTE_ELECTRIC_PISTON = addItem(14, "electric.piston." + componentsName);
48+
GTE_ROBOT_ARM = addItem(15, "robot.arm." + componentsName)
5849
.addComponents(new TooltipBehavior(lines -> {
5950
lines.add(I18n.format("metaitem.robot.arm.tooltip"));
6051
lines.add(I18n.format("gregtech.universal.tooltip.item_transfer_rate", 2));
6152
}));
62-
GTE_FLUID_REGULATOR = addItem(metaStartId += 1, "fluid.regulator." + componentsName)
53+
GTE_FLUID_REGULATOR = addItem(16, "fluid.regulator." + componentsName)
6354
.addComponents(new TooltipBehavior(lines -> {
6455
lines.add(I18n.format("metaitem.fluid.regulator.tooltip"));
6556
lines.add(I18n.format("gregtech.universal.tooltip.fluid_transfer_rate", (1280 / 4) / 20));
6657
}));
67-
GTE_FIELD_GENERATOR = addItem(metaStartId += 1, "field.generator." + componentsName);
68-
GTE_EMITTER = addItem(metaStartId += 1, "emitter." + componentsName);
69-
GTE_SENSOR = addItem(metaStartId + 1, "sensor." + componentsName);
58+
GTE_FIELD_GENERATOR = addItem(17, "field.generator." + componentsName);
59+
GTE_EMITTER = addItem(18, "emitter." + componentsName);
60+
GTE_SENSOR = addItem(19, "sensor." + componentsName);
7061

71-
// Shapes
72-
metaStartId = 101;
62+
// Shapes: ID 101-110
7363
if (AEConfigHolder.moveSteelShape) {
74-
GTE_SHAPE_MOLDS[0] = SHAPE_MOLD_PRINTED_SILICON = addItem(metaStartId, "shape.mold.printed_silicon")
64+
GTE_SHAPE_MOLDS[0] = SHAPE_MOLD_PRINTED_SILICON = addItem(101, "shape.mold.printed_silicon")
7565
.setMaterialInfo(new ItemMaterialInfo(new MaterialStack(Materials.Steel, GTValues.M * 4)));
76-
GTE_SHAPE_MOLDS[1] = SHAPE_MOLD_LOGIC_PROCESSOR = addItem(metaStartId += 1, "shape.mold.logic_processor")
66+
GTE_SHAPE_MOLDS[1] = SHAPE_MOLD_LOGIC_PROCESSOR = addItem(102, "shape.mold.logic_processor")
67+
.setMaterialInfo(new ItemMaterialInfo(new MaterialStack(Materials.Steel, GTValues.M * 4)));
68+
GTE_SHAPE_MOLDS[2] = SHAPE_MOLD_CALCULATION_PROCESSOR = addItem(103, "shape.mold.calculation_processor")
69+
.setMaterialInfo(new ItemMaterialInfo(new MaterialStack(Materials.Steel, GTValues.M * 4)));
70+
GTE_SHAPE_MOLDS[3] = SHAPE_MOLD_ENGINEERING_PROCESSOR = addItem(104, "shape.mold.engineering_processor")
7771
.setMaterialInfo(new ItemMaterialInfo(new MaterialStack(Materials.Steel, GTValues.M * 4)));
78-
GTE_SHAPE_MOLDS[2] = SHAPE_MOLD_CALCULATION_PROCESSOR = addItem(metaStartId += 1,
79-
"shape.mold.calculation_processor")
80-
.setMaterialInfo(new ItemMaterialInfo(new MaterialStack(Materials.Steel, GTValues.M * 4)));
81-
GTE_SHAPE_MOLDS[3] = SHAPE_MOLD_ENGINEERING_PROCESSOR = addItem(metaStartId += 1,
82-
"shape.mold.engineering_processor")
83-
.setMaterialInfo(new ItemMaterialInfo(new MaterialStack(Materials.Steel, GTValues.M * 4)));
8472

85-
GTE_SHAPE_EXTRUDERS[0] = SHAPE_EXTRUDER_PRINTED_SILICON = addItem(metaStartId += 1,
86-
"shape.extruder.printed_silicon")
87-
.setMaterialInfo(new ItemMaterialInfo(new MaterialStack(Materials.Steel, GTValues.M * 4)));
88-
GTE_SHAPE_EXTRUDERS[1] = SHAPE_EXTRUDER_LOGIC_PROCESSOR = addItem(metaStartId += 1,
89-
"shape.extruder.logic_processor")
90-
.setMaterialInfo(new ItemMaterialInfo(new MaterialStack(Materials.Steel, GTValues.M * 4)));
91-
GTE_SHAPE_EXTRUDERS[2] = SHAPE_EXTRUDER_CALCULATION_PROCESSOR = addItem(metaStartId += 1,
73+
GTE_SHAPE_EXTRUDERS[0] = SHAPE_EXTRUDER_PRINTED_SILICON = addItem(105, "shape.extruder.printed_silicon")
74+
.setMaterialInfo(new ItemMaterialInfo(new MaterialStack(Materials.Steel, GTValues.M * 4)));
75+
GTE_SHAPE_EXTRUDERS[1] = SHAPE_EXTRUDER_LOGIC_PROCESSOR = addItem(106, "shape.extruder.logic_processor")
76+
.setMaterialInfo(new ItemMaterialInfo(new MaterialStack(Materials.Steel, GTValues.M * 4)));
77+
GTE_SHAPE_EXTRUDERS[2] = SHAPE_EXTRUDER_CALCULATION_PROCESSOR = addItem(107,
9278
"shape.extruder.calculation_processor")
9379
.setMaterialInfo(new ItemMaterialInfo(new MaterialStack(Materials.Steel, GTValues.M * 4)));
94-
GTE_SHAPE_EXTRUDERS[3] = SHAPE_EXTRUDER_ENGINEERING_PROCESSOR = addItem(metaStartId + 1,
80+
GTE_SHAPE_EXTRUDERS[3] = SHAPE_EXTRUDER_ENGINEERING_PROCESSOR = addItem(108,
9581
"shape.extruder.engineering_processor")
9682
.setMaterialInfo(new ItemMaterialInfo(new MaterialStack(Materials.Steel, GTValues.M * 4)));
9783
}

‎src/main/java/gtexpert/common/items/GTEToolItems.java‎

Lines changed: 0 additions & 42 deletions
This file was deleted.

‎src/main/java/gtexpert/common/metatileentities/GTEMetaTileEntities.java‎

Lines changed: 9 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -26,22 +26,19 @@ public class GTEMetaTileEntities {
2626
public static MetaTileEntityLargeGasCollector LARGE_GAS_COLLECTOR;
2727

2828
public static void init() {
29-
int mteSingleStartId = GTEConfigHolder.gteFeatureFlag.newId ? 0 : 11004;
30-
int mteMultiStartId = GTEConfigHolder.gteFeatureFlag.newId ? 1000 : 12001;
31-
3229
// Steam machines
3330
if (GTEConfigHolder.gteFlag.steamNewMachine) {
34-
STEAM_MIXER_BRONZE = registerMetaTileEntity(mteSingleStartId,
31+
STEAM_MIXER_BRONZE = registerMetaTileEntity(11004,
3532
new SteamMixer(gteId("steam_mixer_bronze"), false));
36-
STEAM_MIXER_STEEL = registerMetaTileEntity(mteSingleStartId += 1,
33+
STEAM_MIXER_STEEL = registerMetaTileEntity(11005,
3734
new SteamMixer(gteId("steam_mixer_steel"), true));
38-
STEAM_ASSEMBLER_BRONZE = registerMetaTileEntity(mteSingleStartId += 1,
35+
STEAM_ASSEMBLER_BRONZE = registerMetaTileEntity(11006,
3936
new SteamAssembler(gteId("steam_assembler_bronze"), false));
40-
STEAM_ASSEMBLER_STEEL = registerMetaTileEntity(mteSingleStartId += 1,
37+
STEAM_ASSEMBLER_STEEL = registerMetaTileEntity(11007,
4138
new SteamAssembler(gteId("steam_assembler_steel"), true));
42-
STEAM_CIRCUIT_ASSEMBLER_BRONZE = registerMetaTileEntity(mteSingleStartId += 1,
39+
STEAM_CIRCUIT_ASSEMBLER_BRONZE = registerMetaTileEntity(11008,
4340
new SteamCircuitAssembler(gteId("steam_circuit_assembler_bronze"), false));
44-
STEAM_CIRCUIT_ASSEMBLER_STEEL = registerMetaTileEntity(mteSingleStartId + 1,
41+
STEAM_CIRCUIT_ASSEMBLER_STEEL = registerMetaTileEntity(11009,
4542
new SteamCircuitAssembler(gteId("steam_circuit_assembler_steel"), true));
4643
}
4744

@@ -50,16 +47,15 @@ public static void init() {
5047
new MetaTileEntityLargeCrackingUnit(gteId("large_cracking_unit")));
5148

5249
// Void Ore Miner
53-
VOIDOREMINER = registerMetaTileEntity(mteMultiStartId += 1,
50+
VOIDOREMINER = registerMetaTileEntity(12003,
5451
new MetaTileEntityVoidOreMiner(gteId("void_ore_miner")));
5552

5653
// Advanced Chemical Plant
57-
mteMultiStartId = GTEConfigHolder.gteFeatureFlag.newId ? mteMultiStartId + 1 : 12006;
58-
ADVANCED_CHEMICAL_PLANT = registerMetaTileEntity(mteMultiStartId,
54+
ADVANCED_CHEMICAL_PLANT = registerMetaTileEntity(12006,
5955
new MetaTileEntityAdvancedChemicalPlant(gteId("advanced_chemical_plant")));
6056

6157
// Large Gas Collector
62-
LARGE_GAS_COLLECTOR = registerMetaTileEntity(mteMultiStartId + 1,
58+
LARGE_GAS_COLLECTOR = registerMetaTileEntity(12007,
6359
new MetaTileEntityLargeGasCollector(gteId(GTEConfigHolder.gteFeatureFlag.migrationMachine ?
6460
"large_gas_collector" : "advanced_gas_collector")));
6561
}

‎src/main/java/gtexpert/core/GTECoreModule.java‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,13 +30,11 @@
3030
import gtexpert.common.blocks.GTEBlockWireCoil;
3131
import gtexpert.common.blocks.GTEMetaBlocks;
3232
import gtexpert.common.items.GTEMetaItems;
33-
import gtexpert.common.items.GTEToolItems;
3433
import gtexpert.common.metatileentities.GTEMetaTileEntities;
3534
import gtexpert.loaders.GTEOreDictionaryLoader;
3635
import gtexpert.loaders.recipe.CEUOverrideRecipe;
3736
import gtexpert.loaders.recipe.GTERecipe;
3837
import gtexpert.loaders.recipe.GTEVanillaOverrideRecipes;
39-
import gtexpert.loaders.recipe.handlers.GTEToolRecipeHandler;
4038
import gtexpert.modules.GTEModules;
4139

4240
@GTEModule(
@@ -68,7 +66,6 @@ public void preInit(FMLPreInitializationEvent event) {
6866

6967
GTEMetaBlocks.init();
7068
GTEMetaItems.init();
71-
GTEToolItems.init();
7269

7370
GTERecipeMaps.init();
7471

@@ -105,7 +102,6 @@ public void registerItems(RegistryEvent.Register<Item> event) {
105102

106103
@Override
107104
public void registerRecipesNormal(RegistryEvent.Register<IRecipe> event) {
108-
GTEToolRecipeHandler.register();
109105
GTEOreDictionaryLoader.init();
110106
GTEMetaTileEntities.init();
111107
}

‎src/main/java/gtexpert/integration/chisel/metatileentities/ChiselMetaTileEntities.java‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,23 +7,21 @@
77
import gregtech.api.util.GTUtility;
88

99
import gtexpert.client.GTETextures;
10-
import gtexpert.common.GTEConfigHolder;
1110
import gtexpert.integration.chisel.ChiselRecipeMaps;
1211

1312
public class ChiselMetaTileEntities {
1413

1514
public static MetaTileEntityAutoChisel[] AUTO_CHISEL = new MetaTileEntityAutoChisel[3];
1615

1716
public static void init() {
18-
int mteStartId = GTEConfigHolder.gteFeatureFlag.newId ? 100 : 11001;
19-
20-
AUTO_CHISEL[0] = registerMetaTileEntity(mteStartId,
17+
// Auto Chisel 11001~11003
18+
AUTO_CHISEL[0] = registerMetaTileEntity(11001,
2119
new MetaTileEntityAutoChisel(gteId("auto_chisel.lv"), ChiselRecipeMaps.AUTO_CHISEL_RECIPES,
2220
GTETextures.AUTO_CHISEL_OVERLAY, LV, true, GTUtility.defaultTankSizeFunction));
23-
AUTO_CHISEL[1] = registerMetaTileEntity(mteStartId += 1,
21+
AUTO_CHISEL[1] = registerMetaTileEntity(11002,
2422
new MetaTileEntityAutoChisel(gteId("auto_chisel.mv"), ChiselRecipeMaps.AUTO_CHISEL_RECIPES,
2523
GTETextures.AUTO_CHISEL_OVERLAY, MV, true, GTUtility.defaultTankSizeFunction));
26-
AUTO_CHISEL[2] = registerMetaTileEntity(mteStartId + 1,
24+
AUTO_CHISEL[2] = registerMetaTileEntity(11003,
2725
new MetaTileEntityAutoChisel(gteId("auto_chisel.hv"), ChiselRecipeMaps.AUTO_CHISEL_RECIPES,
2826
GTETextures.AUTO_CHISEL_OVERLAY, HV, true, GTUtility.defaultTankSizeFunction));
2927
}

‎src/main/java/gtexpert/integration/deda/metatileentities/DEDAMetaTileEntities.java‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,19 +3,15 @@
33
import static gregtech.common.metatileentities.MetaTileEntities.registerMetaTileEntity;
44
import static gtexpert.api.util.GTEUtility.gteId;
55

6-
import gtexpert.common.GTEConfigHolder;
7-
86
public class DEDAMetaTileEntities {
97

108
public static MetaTileEntityDraconiumFusion DRACONIUM_FUSION;
119
public static MetaTileEntityDraconiumFusion AWAKENED_DRACONIUM_FUSION;
1210

1311
public static void init() {
14-
int mteStartId = GTEConfigHolder.gteFeatureFlag.newId ? 2000 : 12004;
15-
16-
DRACONIUM_FUSION = registerMetaTileEntity(mteStartId,
12+
DRACONIUM_FUSION = registerMetaTileEntity(12004,
1713
new MetaTileEntityDraconiumFusion.TierDraconic(gteId("draconium_fusion")));
18-
AWAKENED_DRACONIUM_FUSION = registerMetaTileEntity(mteStartId + 1,
14+
AWAKENED_DRACONIUM_FUSION = registerMetaTileEntity(12005,
1915
new MetaTileEntityDraconiumFusion.TierAwakened(gteId("awakened_draconium_fusion")));
2016
}
2117
}

‎src/main/java/gtexpert/integration/deda/recipemaps/GTEDraconicRecipeMaps.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ public class GTEDraconicRecipeMaps {
2626
* In order to preserve upgrade info NBT, actual recipe is handled by {@link RecipeMapDraconicFusion}.
2727
*/
2828
public static final RecipeMap<TierUpRecipeBuilder> DRACONIC_FUSION_TIER_UP_FAKE_RECIPES = new RecipeMapBuilder<>(
29-
"draconic_fusion_tier_up", new TierUpRecipeBuilder().hidden())
29+
"draconic_fusion_tier_up", new TierUpRecipeBuilder())
3030
.itemInputs(6)
3131
.itemOutputs(3)
3232
.fluidInputs(3)
@@ -51,7 +51,7 @@ public class GTEDraconicRecipeMaps {
5151
* In order to preserve upgrade info NBT, actual recipe is handled by {@link RecipeMapDraconicFusion}.
5252
*/
5353
public static final RecipeMap<TierUpRecipeBuilder> AWAKENED_DRACONIC_FUSION_TIER_UP_FAKE_RECIPES = new RecipeMapBuilder<>(
54-
"awakened_draconic_fusion_tier_up", new TierUpRecipeBuilder().hidden())
54+
"awakened_draconic_fusion_tier_up", new TierUpRecipeBuilder())
5555
.itemInputs(6)
5656
.itemOutputs(3)
5757
.fluidInputs(3)
@@ -64,7 +64,7 @@ public class GTEDraconicRecipeMaps {
6464
* In order to preserve upgrade info NBT, actual recipe is handled by {@link RecipeMapDraconicFusion}.
6565
*/
6666
public static final RecipeMap<UpgradeRecipeBuilder> DRACONIC_FUSION_UPGRADE_FAKE_RECIPES = new RecipeMapBuilder<>(
67-
"draconic_fusion_upgrade", new UpgradeRecipeBuilder().hidden())
67+
"draconic_fusion_upgrade", new UpgradeRecipeBuilder())
6868
.itemInputs(6)
6969
.itemOutputs(3)
7070
.fluidInputs(3)
@@ -90,7 +90,7 @@ public class GTEDraconicRecipeMaps {
9090
* In order to preserve upgrade info NBT, actual recipe is handled by {@link RecipeMapDraconicFusion}.
9191
*/
9292
public static final RecipeMap<UpgradeRecipeBuilder> AWAKENED_DRACONIC_FUSION_UPGRADE_FAKE_RECIPES = new RecipeMapBuilder<>(
93-
"awakened_draconic_fusion_upgrade", new UpgradeRecipeBuilder().hidden())
93+
"awakened_draconic_fusion_upgrade", new UpgradeRecipeBuilder())
9494
.itemInputs(6)
9595
.itemOutputs(3)
9696
.fluidInputs(3)

‎src/main/java/gtexpert/integration/deda/recipemaps/tierup/TierUpRecipeBuilder.java‎

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -72,11 +72,8 @@ protected EnumValidationResult validate() {
7272

7373
@Override
7474
public ValidationResult<Recipe> build() {
75-
EnumValidationResult validationResult = finalizeAndValidate();
76-
if (validationResult != EnumValidationResult.INVALID) {
77-
setFusionProperties();
78-
}
79-
75+
EnumValidationResult validationResult = recipePropertyStorageErrored ? EnumValidationResult.INVALID :
76+
validate();
8077
return ValidationResult.newResult(validationResult,
8178
new Recipe(inputs, outputs, new ChancedOutputList<>(this.chancedOutputLogic, chancedOutputs),
8279
fluidInputs, fluidOutputs,
@@ -127,8 +124,7 @@ public ItemStack getResult() {
127124
}
128125

129126
public ToolUpgradeRecipe getFusionRecipe() {
130-
return this.recipePropertyStorage == null ? null :
131-
this.recipePropertyStorage.getRecipePropertyValue(TierUpRecipeProperty.getInstance(), null);
127+
return this.recipePropertyStorage.get(TierUpRecipeProperty.getInstance(), null);
132128
}
133129

134130
@Override

0 commit comments

Comments
 (0)