Create 6.0.7 compatibility ported

build.gradle.kts

@@ -22,6 +22,7 @@ architectury.common(stonecutter.tree.branches.mapNotNull {
 })
 
 repositories {
+    maven("https://maven.createmod.net")
 	maven("https://mvn.devos.one/snapshots/") // Create Fabric
 	maven("https://mvn.devos.one/releases/") // Porting Lib
 	maven("https://raw.githubusercontent.com/Fuzss/modresources/main/maven/") // Forge Config API Port
@@ -42,8 +43,8 @@ dependencies {
 
 	modImplementation("net.fabricmc:fabric-loader:${mod.dep("fabric_loader_version")}")
 	modImplementation("net.fabricmc.fabric-api:fabric-api:${mod.dep("fabric_api_version")}")
-	modCompileOnly("com.simibubi.create:create-fabric-${mod.dep("minecraft_version")}:${mod.dep("create_fabric_version")}")
-	modCompileOnly("net.fabricmc.fabric-api:fabric-api:${mod.dep("fabric_api_version")}")
+    modCompileOnly("com.simibubi.create:create-fabric:${mod.dep("create_fabric_version")}")
+    modCompileOnly("net.fabricmc.fabric-api:fabric-api:${mod.dep("fabric_api_version")}")
 
 	"io.github.llamalad7:mixinextras-common:${mod.dep("mixin_extras")}".let {
 		annotationProcessor(it)
@@ -56,7 +57,7 @@ dependencies {
 		isTransitive = false
 	}
 
-	modImplementation("com.copycatsplus:copycats:${mod.dep("copycats_version")}+mc.${minecraftVersion}-fabric") {isTransitive=false}
+	//modImplementation("com.copycatsplus:copycats:${mod.dep("copycats_version")}+mc.${minecraftVersion}-fabric") {isTransitive=false}
 }
 
 

fabric/build.gradle.kts

@@ -104,7 +104,7 @@ dependencies {
 	}
 
 	// Create - dependencies are added transitively
-	modImplementation("com.simibubi.create:create-fabric-${minecraftVersion}:${mod.dep("create_fabric_version")}")
+	modImplementation("com.simibubi.create:create-fabric:${mod.dep("create_fabric_version")}")
 
 	// Development QOL
 	modLocalRuntime("maven.modrinth:lazydfu:${mod.dep("lazydfu_version")}")
@@ -134,7 +134,7 @@ dependencies {
 
 	// Fixes, integration
 	//modImplementation("curse.maven:free-cam-557076:${freecam_fabric_file}") // Freecam
-	modImplementation("com.copycatsplus:copycats:${mod.dep("copycats_version")}+mc.${minecraftVersion}-fabric") { isTransitive = false }
+	//modImplementation("com.copycatsplus:copycats:${mod.dep("copycats_version")}+mc.${minecraftVersion}-fabric") { isTransitive = false }
 	// Trinkets and CCA
 	modLocalRuntime("dev.emi:trinkets:${mod.dep("trinkets_fabric_version")}")
 	modCompileOnly("dev.emi:trinkets:${mod.dep("trinkets_fabric_version")}") { exclude(group = "com.terraformersmc") }

fabric/src/generated/resources/data/createbigcannons/tags/items/sheet_gold.json

@@ -0,0 +1,16 @@
+{
+  "values": [
+    {
+      "id": "#forge:plates/gold",
+      "required": false
+    },
+    {
+      "id": "#c:plates/gold",
+      "required": false
+    },
+    {
+      "id": "#c:gold_plates",
+      "required": false
+    }
+  ]
+}

fabric/src/main/java/rbasamoyai/createbigcannons/compat/jei/CannonCastingCategory.java

@@ -1,12 +1,16 @@
 package rbasamoyai.createbigcannons.compat.jei;
 
-import static com.simibubi.create.compat.jei.category.CreateRecipeCategory.addFluidTooltip;
 import static com.simibubi.create.compat.jei.category.CreateRecipeCategory.getRenderedSlot;
 import static com.simibubi.create.compat.jei.category.CreateRecipeCategory.toJei;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Optional;
 
+import com.simibubi.create.AllFluids;
+import com.simibubi.create.content.fluids.potion.PotionFluidHandler;
+
+import io.github.fabricators_of_create.porting_lib.fluids.FluidStack;
 import mezz.jei.api.fabric.constants.FabricTypes;
 import mezz.jei.api.fabric.ingredients.fluids.IJeiFluidIngredient;
 import mezz.jei.api.gui.builder.IRecipeLayoutBuilder;
@@ -16,6 +20,7 @@
 import mezz.jei.api.recipe.RecipeIngredientRole;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.GuiGraphics;
+import net.minecraft.nbt.CompoundTag;
 import net.minecraft.network.chat.Component;
 import net.minecraft.world.item.ItemStack;
 import rbasamoyai.createbigcannons.CreateBigCannons;
@@ -59,7 +64,7 @@ public void setRecipe(IRecipeLayoutBuilder builder, CannonCastingRecipe recipe,
 				fs.setAmount(recipe.shape().fluidSize());
 				return fs;
 			}).toList()))
-			.addTooltipCallback(addFluidTooltip());
+			.addTooltipCallback(CannonCastingCategory::addPotionTooltip);
 
 		builder.addSlot(RecipeIngredientRole.OUTPUT, 142, 62)
 			.setBackground(getRenderedSlot(), -1, -1)
@@ -70,4 +75,21 @@ public void setRecipe(IRecipeLayoutBuilder builder, CannonCastingRecipe recipe,
 			.addItemStack(new ItemStack(recipe.shape().castMould()));
 	}
 
+    // TODO: remove once CreateRecipeCategory#addPotionTooltip is removed. See that method for more details.
+    private static void addPotionTooltip(IRecipeSlotView view, List<Component> tooltip) {
+        Optional<IJeiFluidIngredient> displayed = view.getDisplayedIngredient(FabricTypes.FLUID_STACK);
+        if (displayed.isEmpty())
+            return;
+
+        IJeiFluidIngredient fluidStack = displayed.get();
+
+        if (fluidStack.getFluid().isSame(AllFluids.POTION.get())) {
+            ArrayList<Component> potionTooltip = new ArrayList<>();
+            FluidStack fluidStack1 = new FluidStack(fluidStack.getFluid(), fluidStack.getAmount(), fluidStack.getTag().orElse(new CompoundTag()));
+            PotionFluidHandler.addPotionTooltip(fluidStack1, potionTooltip, 1);
+            // append after item name
+            tooltip.addAll(1, potionTooltip.stream().toList());
+        }
+    }
+
 }

fabric/src/main/java/rbasamoyai/createbigcannons/compat/modmenu/CBCModMenuCompat.java

@@ -3,11 +3,12 @@
 import com.terraformersmc.modmenu.api.ConfigScreenFactory;
 import com.terraformersmc.modmenu.api.ModMenuApi;
 
-import rbasamoyai.createbigcannons.config.CBCConfigs;
+import net.createmod.catnip.config.ui.BaseConfigScreen;
+import rbasamoyai.createbigcannons.CreateBigCannons;
 
 public class CBCModMenuCompat implements ModMenuApi {
 	@Override
 	public ConfigScreenFactory<?> getModConfigScreenFactory() {
-		return CBCConfigs::createConfigScreen;
+		return parent -> new BaseConfigScreen(parent, CreateBigCannons.MOD_ID);
 	}
 }

fabric/src/main/java/rbasamoyai/createbigcannons/compat/rei/CBCREI.java

@@ -32,6 +32,7 @@
 import me.shedaniel.rei.api.common.category.CategoryIdentifier;
 import me.shedaniel.rei.api.common.display.Display;
 import me.shedaniel.rei.plugin.common.BuiltinPlugin;
+import net.minecraft.network.chat.Component;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.item.crafting.CraftingRecipe;

fabric/src/main/java/rbasamoyai/createbigcannons/fabric/CBCDataFabric.java

@@ -3,10 +3,12 @@
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.Set;
+import java.util.function.BiConsumer;
 
 import com.tterrag.registrate.providers.ProviderType;
 
 import io.github.fabricators_of_create.porting_lib.data.ExistingFileHelper;
+import net.createmod.ponder.foundation.PonderIndex;
 import net.fabricmc.fabric.api.datagen.v1.DataGeneratorEntrypoint;
 import net.fabricmc.fabric.api.datagen.v1.FabricDataGenerator;
 import net.fabricmc.fabric.api.datagen.v1.FabricDataGenerator.Pack.Factory;
@@ -25,8 +27,7 @@
 import rbasamoyai.createbigcannons.fabric.datagen.MeltingRecipeProvider;
 import rbasamoyai.createbigcannons.fabric.datagen.assets.CBCBlockPartialsGen;
 import rbasamoyai.createbigcannons.index.CBCSoundEvents;
-import rbasamoyai.createbigcannons.ponder.CBCPonderIndex;
-import rbasamoyai.createbigcannons.ponder.CBCPonderTags;
+import rbasamoyai.createbigcannons.ponder.CBCPonderPlugin;
 
 public class CBCDataFabric implements DataGeneratorEntrypoint {
 
@@ -44,15 +45,15 @@ public void onInitializeDataGenerator(FabricDataGenerator generator) {
 
 		FabricDataGenerator.Pack modDatapack = generator.createPack();
 
-		BlockRecipeProvider.registerAll(modDatapack);
+		BlockRecipeProvider.registerAll(modDatapack::addProvider);
 		CBCCraftingRecipeProvider.register();
 
 		CBCLangGen.prepare();
 		modDatapack.addProvider((Factory<CBCSoundEvents.SoundEntryProvider>) CBCSoundEvents::provider);
 		CBCSoundEvents.registerLangEntries();
-		CBCPonderTags.register();
-		CBCPonderIndex.register();
-		CBCPonderIndex.registerLang();
+        CreateBigCannons.REGISTRATE.addDataGenerator(ProviderType.LANG, prov -> {
+            providePonderLang(prov::add);
+        });
 
 		modDatapack.addProvider((Factory<CBCBlockPartialsGen>) output -> new CBCBlockPartialsGen(output, helper));
 
@@ -64,4 +65,9 @@ public void onInitializeDataGenerator(FabricDataGenerator generator) {
 		modDatapack.addProvider(CBCCuttingRecipeProvider::new);
 	}
 
+    private static void providePonderLang(BiConsumer<String, String> cons) {
+        PonderIndex.addPlugin(new CBCPonderPlugin());
+        PonderIndex.getLangAccess().provideLang(CreateBigCannons.MOD_ID, cons);
+    }
+
 }

fabric/src/main/java/rbasamoyai/createbigcannons/fabric/CBCModsFabric.java

@@ -3,6 +3,7 @@
 import java.util.Optional;
 import java.util.function.Supplier;
 
+import net.createmod.catnip.lang.Lang;
 import net.fabricmc.loader.api.FabricLoader;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.level.block.Block;
@@ -17,7 +18,7 @@ public enum CBCModsFabric {
 	private final String id;
 
 	CBCModsFabric() {
-		this.id = CreateLang.asId(name());
+		this.id = Lang.asId(name());
 	}
 
 	public String id() {

fabric/src/main/java/rbasamoyai/createbigcannons/fabric/CreateBigCannonsFabric.java

@@ -15,6 +15,7 @@
 import rbasamoyai.createbigcannons.crafting.BlockRecipeType;
 import rbasamoyai.createbigcannons.crafting.casting.CannonCastShape;
 import rbasamoyai.createbigcannons.fabric.network.CBCNetworkFabric;
+import rbasamoyai.createbigcannons.index.CBCArmInteractionPointTypes;
 import rbasamoyai.createbigcannons.index.CBCParticleTypes;
 import rbasamoyai.createbigcannons.index.CBCSoundEvents;
 import rbasamoyai.createbigcannons.munitions.big_cannon.fluid_shell.DefaultFluidCompat;
@@ -34,8 +35,9 @@ public void onInitialize() {
 		CannonCastShape.register();
 		BlockRecipeSerializer.register();
 		BlockRecipeType.register();
+        CBCArmInteractionPointTypes.init();
 
-		CBCConfigs.registerConfigs((t, c) -> ForgeConfigRegistry.INSTANCE.register(CreateBigCannons.MOD_ID, t, c));
+		CBCConfigs.register((t, c) -> ForgeConfigRegistry.INSTANCE.register(CreateBigCannons.MOD_ID, t, c));
 
 		CBCNetworkFabric.INSTANCE.initServerListener();
 		DefaultFluidCompat.registerMinecraftBlobEffects();

fabric/src/main/java/rbasamoyai/createbigcannons/fabric/crafting/CannonCastBlockEntityRenderer.java

@@ -2,13 +2,13 @@
 
 import com.mojang.blaze3d.vertex.PoseStack;
 import com.mojang.blaze3d.vertex.VertexConsumer;
-import com.simibubi.create.foundation.fluid.FluidRenderer;
+import com.simibubi.create.foundation.render.fabric.DefaultLayerFilteringBakedModel;
 
-import dev.engine_room.flywheel.core.virtual.VirtualEmptyBlockGetter;
-import dev.engine_room.flywheel.fabric.model.DefaultLayerFilteringBakedModel;
+import dev.engine_room.flywheel.lib.model.baked.EmptyVirtualBlockGetter;
 import io.github.fabricators_of_create.porting_lib.fluids.FluidStack;
 import io.github.fabricators_of_create.porting_lib.models.virtual.FixedLightBakedModel;
 import io.github.fabricators_of_create.porting_lib.models.virtual.TranslucentBakedModel;
+import net.createmod.catnip.platform.FabricCatnipServices;
 import net.minecraft.client.renderer.MultiBufferSource;
 import net.minecraft.client.renderer.blockentity.BlockEntityRendererProvider;
 import net.minecraft.client.renderer.texture.OverlayTexture;
@@ -30,7 +30,7 @@ protected void renderFluidBox(AbstractCannonCastBlockEntity cast, float width, f
 		if (!(cast instanceof CannonCastBlockEntity castc)) return;
 		FluidStack fstack = castc.fluid.getFluid();
 		if (!fstack.isEmpty())
-			FluidRenderer.renderFluidBox(fstack, 0, 0, 0, width, height, width, buffers, stack, light, false);
+			FabricCatnipServices.FLUID_RENDERER.renderFluidBox(fstack, 0, 0, 0, width, height, width, buffers, stack, light, false, false);
 	}
 
 	@Override
@@ -39,8 +39,8 @@ protected void renderPreview(PoseStack ms, float alpha, VertexConsumer vCons, Bl
 		model = DefaultLayerFilteringBakedModel.wrap(model);
 		model = FixedLightBakedModel.wrap(model, light);
 		model = TranslucentBakedModel.wrap(model, () -> alpha);
-		this.dispatcher.getModelRenderer()
-			.tesselateBlock(VirtualEmptyBlockGetter.INSTANCE, model, state, pos, ms, vCons, false, RandomSource.create(), 42L, OverlayTexture.NO_OVERLAY);
+		this.dispatcher.getModelRenderer() // TODO check EVBG
+			.tesselateBlock(EmptyVirtualBlockGetter.FULL_BRIGHT, model, state, pos, ms, vCons, false, RandomSource.create(), 42L, OverlayTexture.NO_OVERLAY);
 	}
 
 

fabric/src/main/java/rbasamoyai/createbigcannons/fabric/datagen/CBCCompactingRecipeProvider.java

@@ -2,27 +2,25 @@
 
 import com.simibubi.create.AllRecipeTypes;
 import com.simibubi.create.AllTags;
+import com.simibubi.create.api.data.recipe.ProcessingRecipeGen;
 import com.simibubi.create.content.processing.recipe.HeatCondition;
-import com.simibubi.create.foundation.data.recipe.ProcessingRecipeGen;
 import com.simibubi.create.foundation.recipe.IRecipeTypeInfo;
 
 import net.fabricmc.fabric.api.datagen.v1.FabricDataOutput;
 import net.fabricmc.fabric.api.resource.conditions.v1.DefaultResourceConditions;
-import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.item.Items;
 import rbasamoyai.createbigcannons.CBCTags;
 import rbasamoyai.createbigcannons.CreateBigCannons;
 import rbasamoyai.createbigcannons.datagen.CBCDatagenCommon;
 import rbasamoyai.createbigcannons.index.CBCBlocks;
 import rbasamoyai.createbigcannons.index.CBCFluids;
 import rbasamoyai.createbigcannons.index.CBCItems;
-import rbasamoyai.createbigcannons.multiloader.IndexPlatform;
 import rbasamoyai.createbigcannons.utils.CBCUtils;
 
 public class CBCCompactingRecipeProvider extends ProcessingRecipeGen {
 
 	public CBCCompactingRecipeProvider(FabricDataOutput output) {
-		super(output);
+		super(output, CreateBigCannons.MOD_ID);
 	}
 
 	@Override

fabric/src/main/java/rbasamoyai/createbigcannons/fabric/datagen/CBCCuttingRecipeProvider.java

@@ -1,7 +1,7 @@
 package rbasamoyai.createbigcannons.fabric.datagen;
 
 import com.simibubi.create.AllRecipeTypes;
-import com.simibubi.create.foundation.data.recipe.ProcessingRecipeGen;
+import com.simibubi.create.api.data.recipe.ProcessingRecipeGen;
 import com.simibubi.create.foundation.recipe.IRecipeTypeInfo;
 
 import net.fabricmc.fabric.api.datagen.v1.FabricDataOutput;
@@ -18,7 +18,7 @@
 public class CBCCuttingRecipeProvider extends ProcessingRecipeGen {
 
 	public CBCCuttingRecipeProvider(FabricDataOutput output) {
-		super(output);
+		super(output, CreateBigCannons.MOD_ID);
 	}
 
 	@Override

fabric/src/main/java/rbasamoyai/createbigcannons/fabric/datagen/CBCMillingRecipeProvider.java

@@ -1,7 +1,7 @@
 package rbasamoyai.createbigcannons.fabric.datagen;
 
 import com.simibubi.create.AllRecipeTypes;
-import com.simibubi.create.foundation.data.recipe.ProcessingRecipeGen;
+import com.simibubi.create.api.data.recipe.ProcessingRecipeGen;
 import com.simibubi.create.foundation.recipe.IRecipeTypeInfo;
 
 import net.fabricmc.fabric.api.datagen.v1.FabricDataOutput;
@@ -11,7 +11,7 @@
 public class CBCMillingRecipeProvider extends ProcessingRecipeGen {
 
 	public CBCMillingRecipeProvider(FabricDataOutput output) {
-		super(output);
+		super(output, CreateBigCannons.MOD_ID);
 	}
 
 	@Override
@@ -21,7 +21,7 @@ protected IRecipeTypeInfo getRecipeType() {
 
 	GeneratedRecipe
 
-		NITROPOWDER = create(CreateBigCannons.resource("alloy_nethersteel_cast_iron"), b -> b.require(CBCItems.HARDENED_NITRO.get())
+		NITROPOWDER = create(CreateBigCannons.resource("nitropowder"), b -> b.require(CBCItems.HARDENED_NITRO.get())
 		.output(CBCItems.NITROPOWDER.get(), 2));
 
 }

fabric/src/main/java/rbasamoyai/createbigcannons/fabric/datagen/CBCMixingRecipeProvider.java

@@ -1,10 +1,10 @@
 package rbasamoyai.createbigcannons.fabric.datagen;
 
 import com.simibubi.create.AllRecipeTypes;
+import com.simibubi.create.api.data.recipe.ProcessingRecipeGen;
 import com.simibubi.create.content.processing.recipe.HeatCondition;
 import com.simibubi.create.content.processing.recipe.ProcessingRecipe;
 import com.simibubi.create.content.processing.recipe.ProcessingRecipeBuilder;
-import com.simibubi.create.foundation.data.recipe.ProcessingRecipeGen;
 import com.simibubi.create.foundation.recipe.IRecipeTypeInfo;
 
 import net.fabricmc.fabric.api.datagen.v1.FabricDataOutput;
@@ -20,7 +20,7 @@
 public class CBCMixingRecipeProvider extends ProcessingRecipeGen {
 
 	public CBCMixingRecipeProvider(FabricDataOutput output) {
-		super(output);
+		super(output, CreateBigCannons.MOD_ID);
 	}
 
 	@Override