Follow changes in MI's API (#66)

Author: Swedz

gradle.properties

@@ -33,16 +33,16 @@ mod_description=An addon mod that extends the content in Modern Industrializatio
 mod_github=https://github.com/Swedz/Extended-Industrialization
 
 # Dependencies
-modern_industrialization_version=2.2.23
-modern_industrialization_version_range=[2.2.21-beta, 2.3-)
+modern_industrialization_version=2.2.27
+modern_industrialization_version_range=[2.2.27, 2.3-)
 grandpower_version=3.0.0
 cloth_config_version=15.0.127
 emi_version=1.1.10+1.21
 emi_version_range=[1.1.10, 1.2-)
-tesseract_version=1.5.3-beta-1.21.1
-tesseract_version_range=[1.5.2-beta-, 1.6-)
-mi_tweaks_version=1.5.3-beta-1.21.1
-mi_tweaks_version_range=[1.5.0-beta-, 1.6-)
+tesseract_version=1.6.0-beta-1.21.1
+tesseract_version_range=[1.6.0-beta-, 1.7-)
+mi_tweaks_version=1.6.0-beta-1.21.1
+mi_tweaks_version_range=[1.6.0-beta-, 1.7-)
 mixinextras_version=0.3.5
 accessories_version=1.0.0-beta.34+1.21
 accessories_version_range=[1.0.0-beta.34-, 1.1.0-)

src/generated/resources/assets/extended_industrialization/models/block/large_configurable_chest.json

@@ -1,5 +1,5 @@
 {
-  "casing": "large_steel_crate",
+  "casing": "extended_industrialization:large_steel_crate",
   "default_overlays": {
     "fluid_auto": "modern_industrialization:block/overlays/fluid_auto",
     "item_auto": "modern_industrialization:block/overlays/item_auto",

src/generated/resources/assets/extended_industrialization/models/block/large_electric_macerator.json

@@ -1,5 +1,5 @@
 {
-  "casing": "steel_plated_bricks",
+  "casing": "extended_industrialization:steel_plated_bricks",
   "default_overlays": {
     "fluid_auto": "modern_industrialization:block/overlays/fluid_auto",
     "front": "extended_industrialization:block/machines/large_macerator/overlay_front",

src/generated/resources/assets/modern_industrialization/models/machine_casing/bronze_pipe.json renamed to src/generated/resources/assets/extended_industrialization/models/machine_casing/bronze_pipe.json

@@ -53,28 +53,28 @@ public static void init(IEventBus bus)
 		Registry.init(bus);
 	}
 
-	public static final ItemHolder<SteamChainsawItem> STEAM_CHAINSAW        = create("steam_chainsaw", "Steam Chainsaw", SteamChainsawItem::new, EISortOrder.GEAR).tag(ItemTags.AXES, ItemTags.HOES, ItemTags.SWORDS, Tags.Items.TOOLS_SHEAR).withModel(CommonModelBuilders::handheld).register();
-	public static final ItemHolder<ElectricToolItem>  ELECTRIC_CHAINSAW     = create("electric_chainsaw", "Electric Chainsaw", (p) -> new ElectricToolItem(p, ElectricToolItem.Type.CHAINSAW), EISortOrder.GEAR).tag(ItemTags.AXES, ItemTags.HOES, ItemTags.SWORDS, Tags.Items.TOOLS_SHEAR).withCapabilities(MICommonCapabitilies::simpleEnergyItem).withModel(CommonModelBuilders::handheld).register();
-	public static final ItemHolder<ElectricToolItem>  ELECTRIC_MINING_DRILL = create("electric_mining_drill", "Electric Mining Drill", (p) -> new ElectricToolItem(p, ElectricToolItem.Type.DRILL), EISortOrder.GEAR).tag(ItemTags.PICKAXES, ItemTags.SHOVELS).withCapabilities(MICommonCapabitilies::simpleEnergyItem).withModel(CommonModelBuilders::handheld).register();
-	public static final ItemHolder<ElectricToolItem>  ULTIMATE_LASER_DRILL  = create("ultimate_laser_drill", "Ultimate Laser Drill", (p) -> new ElectricToolItem(p, ElectricToolItem.Type.ULTIMATE), EISortOrder.GEAR).tag(ItemTags.DYEABLE, EITags.Items.RAINBOW_DYEABLE, ItemTags.PICKAXES, ItemTags.SHOVELS, ItemTags.AXES, ItemTags.HOES, ItemTags.SWORDS, Tags.Items.TOOLS_SHEAR).withRegistrationListener(CommonRegistrations::cauldronClearDye).withRegistrationListener(RainbowDataComponent::cauldronClearDyeAndRainbow).withCapabilities(MICommonCapabitilies::simpleEnergyItem).withModel(CommonModelBuilders::handheldOverlayed).register();
+	public static final ItemHolder<SteamChainsawItem> STEAM_CHAINSAW        = create("steam_chainsaw", "Steam Chainsaw", SteamChainsawItem::new, EISortOrder.GEAR).tag(ItemTags.AXES, ItemTags.HOES, ItemTags.SWORDS, Tags.Items.TOOLS_SHEAR).withModelBuilder(CommonModelBuilders::handheld).register();
+	public static final ItemHolder<ElectricToolItem>  ELECTRIC_CHAINSAW     = create("electric_chainsaw", "Electric Chainsaw", (p) -> new ElectricToolItem(p, ElectricToolItem.Type.CHAINSAW), EISortOrder.GEAR).tag(ItemTags.AXES, ItemTags.HOES, ItemTags.SWORDS, Tags.Items.TOOLS_SHEAR).withCapabilities(MICommonCapabitilies::simpleEnergyItem).withModelBuilder(CommonModelBuilders::handheld).register();
+	public static final ItemHolder<ElectricToolItem>  ELECTRIC_MINING_DRILL = create("electric_mining_drill", "Electric Mining Drill", (p) -> new ElectricToolItem(p, ElectricToolItem.Type.DRILL), EISortOrder.GEAR).tag(ItemTags.PICKAXES, ItemTags.SHOVELS).withCapabilities(MICommonCapabitilies::simpleEnergyItem).withModelBuilder(CommonModelBuilders::handheld).register();
+	public static final ItemHolder<ElectricToolItem>  ULTIMATE_LASER_DRILL  = create("ultimate_laser_drill", "Ultimate Laser Drill", (p) -> new ElectricToolItem(p, ElectricToolItem.Type.ULTIMATE), EISortOrder.GEAR).tag(ItemTags.DYEABLE, EITags.Items.RAINBOW_DYEABLE, ItemTags.PICKAXES, ItemTags.SHOVELS, ItemTags.AXES, ItemTags.HOES, ItemTags.SWORDS, Tags.Items.TOOLS_SHEAR).withRegistrationListener(CommonRegistrations::cauldronClearDye).withRegistrationListener(RainbowDataComponent::cauldronClearDyeAndRainbow).withCapabilities(MICommonCapabitilies::simpleEnergyItem).withModelBuilder(CommonModelBuilders::handheldOverlayed).register();
 	public static final ItemHolder<NanoSuitArmorItem> NANO_HELMET           = createNanosuitArmor("nano_helmet", "Nano Helmet", ArmorItem.Type.HELMET, NanoSuitAbility.NIGHT_VISION);
 	public static final ItemHolder<NanoSuitArmorItem> NANO_CHESTPLATE       = createNanosuitArmor("nano_chestplate", "Nano Chestplate", ArmorItem.Type.CHESTPLATE);
 	public static final ItemHolder<NanoSuitArmorItem> NANO_GRAVICHESTPLATE  = createNanosuitArmor("nano_gravichestplate", "Nano Gravichestplate", ArmorItem.Type.CHESTPLATE, EIArmorMaterials.NANO_GRAVICHESTPLATE, NanoSuitAbility.GRAVICHESTPLATE);
 	public static final ItemHolder<NanoSuitArmorItem> NANO_LEGGINGS         = createNanosuitArmor("nano_leggings", "Nano Leggings", ArmorItem.Type.LEGGINGS, NanoSuitAbility.SPEED);
 	public static final ItemHolder<NanoSuitArmorItem> NANO_BOOTS            = createNanosuitArmor("nano_boots", "Nano Boots", ArmorItem.Type.BOOTS);
 
-	public static final ItemHolder<Item> TIN_CAN     = create("tin_can", "Tin Can", Item::new, EISortOrder.OTHER_GEAR).withModel(CommonModelBuilders::generated).register();
-	public static final ItemHolder<Item> CANNED_FOOD = create("canned_food", "Canned Food", Item::new, EISortOrder.OTHER_GEAR).withProperties((p) -> p.food(new FoodProperties.Builder().nutrition(2).saturationModifier(0.3f).fast().usingConvertsTo(TIN_CAN).build())).tag(ItemTags.WOLF_FOOD, ItemTags.CAT_FOOD).withModel(CommonModelBuilders::generated).register();
+	public static final ItemHolder<Item> TIN_CAN     = create("tin_can", "Tin Can", Item::new, EISortOrder.OTHER_GEAR).withModelBuilder(CommonModelBuilders::generated).register();
+	public static final ItemHolder<Item> CANNED_FOOD = create("canned_food", "Canned Food", Item::new, EISortOrder.OTHER_GEAR).withProperties((p) -> p.food(new FoodProperties.Builder().nutrition(2).saturationModifier(0.3f).fast().usingConvertsTo(TIN_CAN).build())).tag(ItemTags.WOLF_FOOD, ItemTags.CAT_FOOD).withModelBuilder(CommonModelBuilders::generated).register();
 
-	public static final ItemHolder<MachineConfigCardItem> MACHINE_CONFIG_CARD = create("machine_config_card", "Machine Config Card", MachineConfigCardItem::new, EISortOrder.OTHER_GEAR).withModel(CommonModelBuilders::generated).register();
+	public static final ItemHolder<MachineConfigCardItem> MACHINE_CONFIG_CARD = create("machine_config_card", "Machine Config Card", MachineConfigCardItem::new, EISortOrder.OTHER_GEAR).withModelBuilder(CommonModelBuilders::generated).register();
 
-	public static final ItemHolder<Item> NETHERITE_ROTARY_BLADE = create("netherite_rotary_blade", "Netherite Rotary Blade", Item::new, EISortOrder.PARTS).withModel(CommonModelBuilders::generated).register();
-	public static final ItemHolder<Item> STEEL_COMBINE          = create("steel_combine", "Steel Combine", Item::new, EISortOrder.PARTS).withModel(CommonModelBuilders::generated).register();
+	public static final ItemHolder<Item> NETHERITE_ROTARY_BLADE = create("netherite_rotary_blade", "Netherite Rotary Blade", Item::new, EISortOrder.PARTS).withModelBuilder(CommonModelBuilders::generated).register();
+	public static final ItemHolder<Item> STEEL_COMBINE          = create("steel_combine", "Steel Combine", Item::new, EISortOrder.PARTS).withModelBuilder(CommonModelBuilders::generated).register();
 
-	public static final ItemHolder<Item> MULCH              = create("mulch", "Mulch", Item::new, EISortOrder.RESOURCES).withProperties((p) -> p.food(new FoodProperties.Builder().nutrition(2).saturationModifier(0.3f).fast().build())).withModel(CommonModelBuilders::generated).register();
-	public static final ItemHolder<Item> NETHERITE_DUST     = create("netherite_dust", "Netherite Dust", Item::new, EISortOrder.RESOURCES).tag(EITags.itemCommon("dusts"), EITags.itemCommon("dusts/netherite")).withModel(CommonModelBuilders::generated).register();
-	public static final ItemHolder<Item> CRYSTALLIZED_HONEY = create("crystallized_honey", "Crystallized Honey", Item::new, EISortOrder.RESOURCES).withProperties((p) -> p.food(new FoodProperties.Builder().nutrition(3).saturationModifier(0.3f).fast().build())).withModel(CommonModelBuilders::generated).register();
-	public static final ItemHolder<Item> GRANITE_DUST       = create("granite_dust", "Granite Dust", Item::new, EISortOrder.RESOURCES).tag(EITags.itemCommon("dusts"), EITags.itemCommon("dusts/granite")).withModel(CommonModelBuilders::generated).register();
+	public static final ItemHolder<Item> MULCH              = create("mulch", "Mulch", Item::new, EISortOrder.RESOURCES).withProperties((p) -> p.food(new FoodProperties.Builder().nutrition(2).saturationModifier(0.3f).fast().build())).withModelBuilder(CommonModelBuilders::generated).register();
+	public static final ItemHolder<Item> NETHERITE_DUST     = create("netherite_dust", "Netherite Dust", Item::new, EISortOrder.RESOURCES).tag(EITags.itemCommon("dusts"), EITags.itemCommon("dusts/netherite")).withModelBuilder(CommonModelBuilders::generated).register();
+	public static final ItemHolder<Item> CRYSTALLIZED_HONEY = create("crystallized_honey", "Crystallized Honey", Item::new, EISortOrder.RESOURCES).withProperties((p) -> p.food(new FoodProperties.Builder().nutrition(3).saturationModifier(0.3f).fast().build())).withModelBuilder(CommonModelBuilders::generated).register();
+	public static final ItemHolder<Item> GRANITE_DUST       = create("granite_dust", "Granite Dust", Item::new, EISortOrder.RESOURCES).tag(EITags.itemCommon("dusts"), EITags.itemCommon("dusts/granite")).withModelBuilder(CommonModelBuilders::generated).register();
 
 	public static final ItemHolder<PhotovoltaicCellItem> LV_PHOTOVOLTAIC_CELL = createPhotovoltaicCell("lv", "LV", CableTier.LV, 16, 10 * 60 * 20);
 	public static final ItemHolder<PhotovoltaicCellItem> MV_PHOTOVOLTAIC_CELL = createPhotovoltaicCell("mv", "MV", CableTier.MV, 64, 10 * 60 * 20);
@@ -116,7 +116,7 @@ public static ItemHolder<NanoSuitArmorItem> createNanosuitArmor(String id, Strin
 				.withRegistrationListener(CommonRegistrations::cauldronClearDye)
 				.withRegistrationListener(RainbowDataComponent::cauldronClearDyeAndRainbow)
 				.withCapabilities(MICommonCapabitilies::simpleEnergyItem)
-				.withModel(CommonModelBuilders::generatedOverlayed)
+				.withModelBuilder(CommonModelBuilders::generatedOverlayed)
 				.register();
 	}
 
@@ -144,7 +144,7 @@ public static ItemHolder<PhotovoltaicCellItem> createPhotovoltaicCell(String id,
 	{
 		return create("%s_photovoltaic_cell".formatted(id), "%s Photovoltaic Cell".formatted(name), (p) -> new PhotovoltaicCellItem(p, tier, euPerTick, durationTicks), EISortOrder.PARTS)
 				.tag(EITags.Items.PHOTOVOLTAIC_CELL)
-				.withModel(CommonModelBuilders::generated)
+				.withModelBuilder(CommonModelBuilders::generated)
 				.register();
 	}
 }

src/generated/resources/assets/modern_industrialization/models/machine_casing/large_steel_crate.json renamed to src/generated/resources/assets/extended_industrialization/models/machine_casing/large_steel_crate.json

@@ -78,7 +78,7 @@ public static void casings(MachineCasingsMIHookContext hook)
 		Casings.BRONZE_PIPE = hook.registerImitateBlock("bronze_pipe", () -> MIMaterials.BRONZE.getPart(MIParts.MACHINE_CASING_PIPE).asBlock());
 		Casings.STEEL_PIPE = hook.registerImitateBlock("steel_pipe", () -> MIMaterials.STEEL.getPart(MIParts.MACHINE_CASING_PIPE).asBlock());
 		Casings.STEEL_PLATED_BRICKS = hook.registerImitateBlock("steel_plated_bricks", EIBlocks.STEEL_PLATED_BRICKS);
-		Casings.LARGE_STEEL_CRATE = hook.registerCubeAll("large_steel_crate", EI.id("block/casings/large_steel_crate"));
+		Casings.LARGE_STEEL_CRATE = hook.registerCubeAll("large_steel_crate", "Large Steel Crate", EI.id("block/casings/large_steel_crate"));
 	}
 
 	public static final class RecipeTypes

src/generated/resources/assets/modern_industrialization/models/machine_casing/steel_pipe.json renamed to src/generated/resources/assets/extended_industrialization/models/machine_casing/steel_pipe.json

@@ -18,7 +18,10 @@ protected void registerStatesAndModels()
 	{
 		for(BlockHolder<?> block : EIBlocks.values())
 		{
-			block.modelBuilder().accept(this);
+			if(block.hasModelProvider())
+			{
+				block.modelProvider().accept(this);
+			}
 		}
 	}