maxscout/Create-The_Factory_Must_Grow
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update to Create 6.0.8

Browse Source 
Updated mod to support Create 6.0.8-290

Changes:
- Updated Create dependency from 6.0.6-150 to 6.0.8-290
- Migrated tagBlockAndItem() calls to new TagKey-based API
- Removed deprecated CreatePonderPlugin imports
- Removed unused CompatMetals class reference
- Cleaned up unused imports in PonderPlugin

All compilation errors resolved. Mod is now compatible with Create 6.0.8.
This commit is contained in:
Rhodinium
2025-11-16 17:12:44 +00:00
parent fab00f0fda
commit 3222774286
8 changed files with 44 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
gradle.properties
View File

@@ -16,8 +16,8 @@ mixin_extras_version = 0.4.1
jei_minecraft_version = 1.20.1
jei_version = 15.19.0.85
create_version = 6.0.6-150
ponder_version = 1.0.80
create_version = 6.0.8-290
ponder_version = 1.0.91
flywheel_version = 1.0.4
registrate_version = MC1.20-1.3.3

1
src/main/java/com/drmangotea/tfmg/TFMGClient.java
View File

@@ -6,7 +6,6 @@ import com.drmangotea.tfmg.content.items.weapons.flamethrover.FlamethrowerRender
import com.drmangotea.tfmg.content.items.weapons.quad_potato_cannon.QuadPotatoCannonRenderHandler;
import com.drmangotea.tfmg.ponder.TFMGPonderPlugin;
import com.drmangotea.tfmg.registry.TFMGParticleTypes;
import com.simibubi.create.foundation.ponder.CreatePonderPlugin;
import net.createmod.ponder.foundation.PonderIndex;
import net.minecraftforge.common.MinecraftForge;
import net.minecraftforge.eventbus.api.IEventBus;

2
src/main/java/com/drmangotea/tfmg/base/TFMGBuilderTransformers.java
View File

@@ -328,7 +328,7 @@ public class TFMGBuilderTransformers {
.transform(pickaxeOnly())
.blockstate(simpleCubeAll("concrete"))
.tag(BlockTags.NEEDS_STONE_TOOL)
.transform(tagBlockAndItem("concrete"))
.transform(tagBlockAndItem(com.drmangotea.tfmg.registry.TFMGTags.forgeBlockTag("concrete"), com.drmangotea.tfmg.registry.TFMGTags.forgeItemTag("concrete")))
.build()
.register();

1
src/main/java/com/drmangotea/tfmg/datagen/TFMGDatagen.java
View File

@@ -14,7 +14,6 @@ import com.drmangotea.tfmg.ponder.TFMGPonderPlugin;
import com.google.gson.JsonElement;
import com.google.gson.JsonObject;
import com.simibubi.create.Create;
import com.simibubi.create.foundation.ponder.CreatePonderPlugin;
import com.simibubi.create.foundation.utility.FilesHelper;
import com.tterrag.registrate.providers.ProviderType;
import net.createmod.ponder.foundation.PonderIndex;

8
src/main/java/com/drmangotea/tfmg/datagen/recipes/values/TFMGStandardRecipeGen.java
View File

@@ -15,7 +15,7 @@ import com.simibubi.create.AllBlocks;
import com.simibubi.create.AllItems;
import com.simibubi.create.AllRecipeTypes;
import com.simibubi.create.content.decoration.palettes.AllPaletteBlocks;
import com.simibubi.create.foundation.data.recipe.CompatMetals;
import com.simibubi.create.foundation.data.recipe.CommonMetal;
import com.simibubi.create.foundation.data.recipe.Mods;
import com.tterrag.registrate.util.entry.BlockEntry;
import com.tterrag.registrate.util.entry.ItemEntry;
@@ -2399,9 +2399,9 @@ public class TFMGStandardRecipeGen extends TFMGRecipeProvider {
.inBlastFurnace();
}
TFMGRecipeProvider.GeneratedRecipe blastModdedCrushedMetal(ItemEntry<? extends Item> ingredient, CompatMetals metal) {
String metalName = metal.getName();
for (Mods mod : metal.getMods()) {
TFMGRecipeProvider.GeneratedRecipe blastModdedCrushedMetal(ItemEntry<? extends Item> ingredient, CommonMetal metal) {
for (Mods mod : metal.mods) {
String metalName = metal.getName(mod);
ResourceLocation ingot = mod.ingotOf(metalName);
String modId = mod.getId();
create(ingot).withSuffix("_compat_" + modId)

8
src/main/java/com/drmangotea/tfmg/ponder/TFMGPonderPlugin.java
View File

@@ -1,18 +1,10 @@
package com.drmangotea.tfmg.ponder;
import com.drmangotea.tfmg.TFMG;
import com.simibubi.create.AllBlocks;
import com.simibubi.create.Create;
import com.simibubi.create.content.kinetics.crank.ValveHandleBlock;
import com.simibubi.create.content.logistics.packagePort.postbox.PostboxBlock;
import com.simibubi.create.content.logistics.tableCloth.TableClothBlock;
import com.simibubi.create.foundation.ponder.PonderWorldBlockEntityFix;
import com.simibubi.create.infrastructure.ponder.AllCreatePonderScenes;
import com.simibubi.create.infrastructure.ponder.AllCreatePonderTags;
import net.createmod.ponder.api.level.PonderLevel;
import net.createmod.ponder.api.registration.*;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.world.item.DyeColor;
public class TFMGPonderPlugin implements PonderPlugin {

52
src/main/java/com/drmangotea/tfmg/registry/TFMGBlocks.java
View File

@@ -163,6 +163,8 @@ import static com.simibubi.create.foundation.data.CreateRegistrate.connectedText
import static com.simibubi.create.foundation.data.ModelGen.customItemModel;
import static com.simibubi.create.foundation.data.TagGen.*;
import static com.simibubi.create.foundation.data.TagGen.tagBlockAndItem;
import static com.drmangotea.tfmg.registry.TFMGTags.forgeBlockTag;
import static com.drmangotea.tfmg.registry.TFMGTags.forgeItemTag;
@SuppressWarnings("removal")
public class TFMGBlocks {
@@ -526,7 +528,10 @@ public class TFMGBlocks {
.apply(ApplyBonusCount.addOreBonusCount(Enchantments.BLOCK_FORTUNE))))))
.tag(BlockTags.NEEDS_STONE_TOOL)
.tag(Tags.Blocks.ORES)
.transform(tagBlockAndItem("ores/lead", "ores_in_ground/stone"))
.tag(forgeBlockTag("ores/lead"))
.tag(forgeBlockTag("ores_in_ground/stone"))
.transform(tagBlockAndItem(forgeBlockTag("ores/lead"), forgeItemTag("ores/lead")))
.tag(forgeItemTag("ores_in_ground/stone"))
.tag(Tags.Items.ORES)
.build()
.register();
@@ -543,7 +548,10 @@ public class TFMGBlocks {
.apply(ApplyBonusCount.addOreBonusCount(Enchantments.BLOCK_FORTUNE))))))
.tag(BlockTags.NEEDS_STONE_TOOL)
.tag(Tags.Blocks.ORES)
.transform(tagBlockAndItem("ores/lead", "ores_in_ground/deepslate"))
.tag(forgeBlockTag("ores/lead"))
.tag(forgeBlockTag("ores_in_ground/deepslate"))
.transform(tagBlockAndItem(forgeBlockTag("ores/lead"), forgeItemTag("ores/lead")))
.tag(forgeItemTag("ores_in_ground/deepslate"))
.tag(Tags.Items.ORES)
.build()
.register();
@@ -560,7 +568,10 @@ public class TFMGBlocks {
.apply(ApplyBonusCount.addOreBonusCount(Enchantments.BLOCK_FORTUNE))))))
.tag(BlockTags.NEEDS_STONE_TOOL)
.tag(Tags.Blocks.ORES)
.transform(tagBlockAndItem("ores/nickel", "ores_in_ground/stone"))
.tag(forgeBlockTag("ores/nickel"))
.tag(forgeBlockTag("ores_in_ground/stone"))
.transform(tagBlockAndItem(forgeBlockTag("ores/nickel"), forgeItemTag("ores/nickel")))
.tag(forgeItemTag("ores_in_ground/stone"))
.tag(Tags.Items.ORES)
.build()
.register();
@@ -577,7 +588,10 @@ public class TFMGBlocks {
.apply(ApplyBonusCount.addOreBonusCount(Enchantments.BLOCK_FORTUNE))))))
.tag(BlockTags.NEEDS_STONE_TOOL)
.tag(Tags.Blocks.ORES)
.transform(tagBlockAndItem("ores/nickel", "ores_in_ground/deepslate"))
.tag(forgeBlockTag("ores/nickel"))
.tag(forgeBlockTag("ores_in_ground/deepslate"))
.transform(tagBlockAndItem(forgeBlockTag("ores/nickel"), forgeItemTag("ores/nickel")))
.tag(forgeItemTag("ores_in_ground/deepslate"))
.tag(Tags.Items.ORES)
.build()
.register();
@@ -594,7 +608,10 @@ public class TFMGBlocks {
.apply(ApplyBonusCount.addOreBonusCount(Enchantments.BLOCK_FORTUNE))))))
.tag(BlockTags.NEEDS_STONE_TOOL)
.tag(Tags.Blocks.ORES)
.transform(tagBlockAndItem("ores/lithium", "ores_in_ground/stone"))
.tag(forgeBlockTag("ores/lithium"))
.tag(forgeBlockTag("ores_in_ground/stone"))
.transform(tagBlockAndItem(forgeBlockTag("ores/lithium"), forgeItemTag("ores/lithium")))
.tag(forgeItemTag("ores_in_ground/stone"))
.tag(Tags.Items.ORES)
.build()
.register();
@@ -611,7 +628,10 @@ public class TFMGBlocks {
.apply(ApplyBonusCount.addOreBonusCount(Enchantments.BLOCK_FORTUNE))))))
.tag(BlockTags.NEEDS_STONE_TOOL)
.tag(Tags.Blocks.ORES)
.transform(tagBlockAndItem("ores/lithium", "ores_in_ground/deepslate"))
.tag(forgeBlockTag("ores/lithium"))
.tag(forgeBlockTag("ores_in_ground/deepslate"))
.transform(tagBlockAndItem(forgeBlockTag("ores/lithium"), forgeItemTag("ores/lithium")))
.tag(forgeItemTag("ores_in_ground/deepslate"))
.tag(Tags.Items.ORES)
.build()
.register();
@@ -661,7 +681,7 @@ public class TFMGBlocks {
.tag(Tags.Blocks.STORAGE_BLOCKS)
.tag(BlockTags.NEEDS_IRON_TOOL)
.lang("Block of Raw Nickel")
.transform(tagBlockAndItem("storage_blocks/raw_nickel"))
.transform(tagBlockAndItem(forgeBlockTag("storage_blocks/raw_nickel"), forgeItemTag("storage_blocks/raw_nickel")))
.tag(Tags.Items.STORAGE_BLOCKS)
.build()
.register();
@@ -672,7 +692,7 @@ public class TFMGBlocks {
.tag(Tags.Blocks.STORAGE_BLOCKS)
.tag(BlockTags.NEEDS_IRON_TOOL)
.lang("Block of Raw Lead")
.transform(tagBlockAndItem("storage_blocks/raw_lead"))
.transform(tagBlockAndItem(forgeBlockTag("storage_blocks/raw_lead"), forgeItemTag("storage_blocks/raw_lead")))
.tag(Tags.Items.STORAGE_BLOCKS)
.build()
.register();
@@ -683,7 +703,7 @@ public class TFMGBlocks {
.tag(Tags.Blocks.STORAGE_BLOCKS)
.tag(BlockTags.NEEDS_IRON_TOOL)
.lang("Block of Raw Lithium")
.transform(tagBlockAndItem("storage_blocks/raw_lithium"))
.transform(tagBlockAndItem(forgeBlockTag("storage_blocks/raw_lithium"), forgeItemTag("storage_blocks/raw_lithium")))
.tag(Tags.Items.STORAGE_BLOCKS)
.build()
.register();
@@ -1432,7 +1452,7 @@ public class TFMGBlocks {
.tag(TFMGTags.TFMGBlockTags.REINFORCED_BLAST_FURNACE_SUPPORT.tag)
.tag(Tags.Blocks.STORAGE_BLOCKS)
.tag(BlockTags.BEACON_BASE_BLOCKS)
.transform(tagBlockAndItem("storage_blocks/steel"))
.transform(tagBlockAndItem(forgeBlockTag("storage_blocks/steel"), forgeItemTag("storage_blocks/steel")))
.tag(Tags.Items.STORAGE_BLOCKS)
.build()
.lang("Block of Steel")
@@ -1448,7 +1468,7 @@ public class TFMGBlocks {
.tag(BlockTags.NEEDS_IRON_TOOL)
.tag(Tags.Blocks.STORAGE_BLOCKS)
.tag(BlockTags.BEACON_BASE_BLOCKS)
.transform(tagBlockAndItem("storage_blocks/cast_iron"))
.transform(tagBlockAndItem(forgeBlockTag("storage_blocks/cast_iron"), forgeItemTag("storage_blocks/cast_iron")))
.tag(Tags.Items.STORAGE_BLOCKS)
.build()
.lang("Block of Cast Iron")
@@ -1465,7 +1485,7 @@ public class TFMGBlocks {
.tag(BlockTags.NEEDS_IRON_TOOL)
.tag(Tags.Blocks.STORAGE_BLOCKS)
.tag(BlockTags.BEACON_BASE_BLOCKS)
.transform(tagBlockAndItem("storage_blocks/aluminum"))
.transform(tagBlockAndItem(forgeBlockTag("storage_blocks/aluminum"), forgeItemTag("storage_blocks/aluminum")))
.tag(Tags.Items.STORAGE_BLOCKS)
.build()
.lang("Block of Aluminum")
@@ -1478,7 +1498,7 @@ public class TFMGBlocks {
.blockstate(simpleCubeAll("plastic_block"))
.tag(BlockTags.NEEDS_STONE_TOOL)
.tag(Tags.Blocks.STORAGE_BLOCKS)
.transform(tagBlockAndItem("storage_blocks/plastic"))
.transform(tagBlockAndItem(forgeBlockTag("storage_blocks/plastic"), forgeItemTag("storage_blocks/plastic")))
.tag(Tags.Items.STORAGE_BLOCKS)
.build()
.lang("Block of Plastic")
@@ -1494,7 +1514,7 @@ public class TFMGBlocks {
.tag(BlockTags.NEEDS_IRON_TOOL)
.tag(Tags.Blocks.STORAGE_BLOCKS)
.tag(BlockTags.BEACON_BASE_BLOCKS)
.transform(tagBlockAndItem("storage_blocks/lead"))
.transform(tagBlockAndItem(forgeBlockTag("storage_blocks/lead"), forgeItemTag("storage_blocks/lead")))
.tag(Tags.Items.STORAGE_BLOCKS)
.build()
.lang("Block of Lead")
@@ -1508,7 +1528,7 @@ public class TFMGBlocks {
.tag(BlockTags.NEEDS_IRON_TOOL)
.tag(Tags.Blocks.STORAGE_BLOCKS)
.tag(BlockTags.BEACON_BASE_BLOCKS)
.transform(tagBlockAndItem("storage_blocks/constantan"))
.transform(tagBlockAndItem(forgeBlockTag("storage_blocks/constantan"), forgeItemTag("storage_blocks/constantan")))
.tag(Tags.Items.STORAGE_BLOCKS)
.build()
.lang("Block of Constantan")
@@ -1523,7 +1543,7 @@ public class TFMGBlocks {
.tag(BlockTags.NEEDS_IRON_TOOL)
.tag(Tags.Blocks.STORAGE_BLOCKS)
.tag(BlockTags.BEACON_BASE_BLOCKS)
.transform(tagBlockAndItem("storage_blocks/nickel"))
.transform(tagBlockAndItem(forgeBlockTag("storage_blocks/nickel"), forgeItemTag("storage_blocks/nickel")))
.tag(Tags.Items.STORAGE_BLOCKS)
.build()
.lang("Block of Nickel")

2
src/main/resources/META-INF/mods.toml
View File

@@ -57,7 +57,7 @@ description='''${mod_description}'''
[[dependencies."${mod_id}"]]
modId="create"
mandatory=true
versionRange="[6.0.6,6.1.0)"
versionRange="[6.0.8,6.1.0)"
ordering="AFTER"
side="BOTH"
[[dependencies."${mod_id}"]]