not create.

DM-Earth · Oct 2, 2023 · 6104c54 · 6104c54
1 parent 4485a24
commit 6104c54
Show file tree

Hide file tree

Showing 49 changed files with 159 additions and 1,196 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -85,13 +85,16 @@ dependencies {
     modImplementation(libs.quilted.fabric.api)
 
     // Create
+    /*
     modImplementation(
         "com.simibubi.create:create-fabric-" +
                 "${property("minecraftVersion")}" + ":" +
                 "${property("createVersion")}" +
                 "+mc" + "${property("minecraftVersion")}"
     ) { exclude(group = "com.github.AlphaMode") }
 
+     */
+
     // Implemented Mods
     // - Miscellaneous
     modImplementation(

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -2,7 +2,7 @@
 # The latest versions are available at https://lambdaurora.dev/tools/import_quilt.html
 minecraft = "1.20.1"
 quilt_mappings = "1.20.1+build.23"
-quilt_loader = "0.21.0-beta.4"
+quilt_loader = "0.21.0"
 
 quilted_fabric_api = "7.3.1+0.89.3-1.20.1"
 

diff --git a/src/main/java/dm/earth/cabricality/ModEntry.java b/src/main/java/dm/earth/cabricality/ModEntry.java
@@ -1,6 +1,5 @@
 package dm.earth.cabricality;
 
-import com.simibubi.create.content.processing.recipe.ProcessingOutput;
 import net.minecraft.block.Block;
 import net.minecraft.fluid.Fluid;
 import net.minecraft.item.Item;
@@ -107,6 +106,7 @@ public Ingredient asIngredient(String... paths) {
 		return Ingredient.ofItems(asItem(paths));
 	}
 
+	/*
 	public ProcessingOutput asProcessingOutput(String... paths) {
 		return asProcessingOutput(1, paths);
 	}
@@ -119,6 +119,8 @@ public ProcessingOutput asProcessingOutput(float chance, int count, String... pa
 		return new ProcessingOutput(asStack(count, paths), chance);
 	}
 
+	 */
+
 	public Fluid asFluid(String... paths) {
 		return Registries.FLUID.get(id(paths));
 	}

diff --git a/src/main/java/dm/earth/cabricality/client/CabricalityClient.java b/src/main/java/dm/earth/cabricality/client/CabricalityClient.java
@@ -58,11 +58,14 @@ public void onInitializeClient(ModContainer mod) {
 		BlockRenderLayerMap.put(RenderLayer.getCutout(),
 				Substrate.getJarBlocks(true).toArray(new Block[0]));
 
+		/*
 		Arrays.stream(MachineBlockEntry.values())
 				.forEach(entry -> BlockRenderLayerMap.put(entry.getLayer(), entry.getBlock()));
 		Arrays.stream(CasingBlockEntry.values())
 				.forEach(entry -> BlockRenderLayerMap.put(entry.getLayer(), entry.getBlock()));
 
+		 */
+
 		ResourceLoader.registerBuiltinResourcePack(Cabricality.id("asset_edits"),
 				ResourcePackActivationType.DEFAULT_ENABLED,
 				Cabricality.genTranslatableText("pack", "asset_edits"));

diff --git a/src/main/java/dm/earth/cabricality/content/core/blocks/CasingBlockEntry.java b/src/main/java/dm/earth/cabricality/content/core/blocks/CasingBlockEntry.java
@@ -2,7 +2,6 @@
 
 import dm.earth.cabricality.Cabricality;
 import dm.earth.cabricality.content.core.blocks.casing.SimpleCasingBlock;
-import com.simibubi.create.content.decoration.encasing.CasingBlock;
 import net.minecraft.block.MapColor;
 import net.minecraft.client.render.RenderLayer;
 import net.minecraft.util.Identifier;
@@ -11,6 +10,7 @@
 import java.util.function.Supplier;
 
 public enum CasingBlockEntry {
+	/*
 	ZINC(
 			"zinc", () -> RenderLayer.getSolid(),
 			new SimpleCasingBlock(QuiltBlockSettings.create()
@@ -68,4 +68,6 @@ public CasingBlock getBlock() {
 	public Identifier getId() {
 		return Cabricality.id(name + "_casing");
 	}
+
+	 */
 }
diff --git a/src/main/java/dm/earth/cabricality/content/core/blocks/casing/SimpleCasingBlock.java b/src/main/java/dm/earth/cabricality/content/core/blocks/casing/SimpleCasingBlock.java
@@ -3,12 +3,12 @@
 import dm.earth.cabricality.Cabricality;
 import dm.earth.cabricality.lib.resource.ResourcedBlock;
 import dm.earth.cabricality.lib.resource.assets.gen.block.BlockStatesGenerator;
-import com.simibubi.create.content.decoration.encasing.CasingBlock;
+import net.minecraft.block.Block;
 import net.minecraft.data.client.model.BlockStateSupplier;
 import net.minecraft.util.Identifier;
 import org.jetbrains.annotations.Nullable;
 
-public class SimpleCasingBlock extends CasingBlock implements ResourcedBlock {
+public class SimpleCasingBlock extends Block implements ResourcedBlock {
 	public final String name;
 
 	public SimpleCasingBlock(Settings settings, String name) {

diff --git a/src/main/java/dm/earth/cabricality/content/core/items/MechanismItem.java b/src/main/java/dm/earth/cabricality/content/core/items/MechanismItem.java
@@ -4,7 +4,6 @@
 import dm.earth.cabricality.content.entries.CabfItems;
 import dm.earth.cabricality.lib.core.IncompleteVariant;
 
-import com.simibubi.create.content.processing.sequenced.SequencedAssemblyItem;
 import net.minecraft.item.Item;
 import net.minecraft.util.Identifier;
 import net.minecraft.util.Rarity;
@@ -38,13 +37,13 @@ public static enum Type {
 
         private final String name;
         private final MechanismItem item;
-        private final SequencedAssemblyItem incompleteItem;
+        // private final SequencedAssemblyItem incompleteItem;
 
         Type(String name, Rarity rarity) {
             this.name = name;
             MechanismItem newItem = new MechanismItem(name, CabfItems.Suppliers.DEFAULT.get().rarity(rarity));
             this.item = newItem;
-            this.incompleteItem = newItem.newIncomplete(rarity);
+            // this.incompleteItem = newItem.newIncomplete(rarity);
         }
 
         Type(String name) {
@@ -67,8 +66,11 @@ public MechanismItem getItem() {
             return item;
         }
 
+		/*
         public SequencedAssemblyItem getIncompleteItem() {
             return incompleteItem;
         }
+
+		 */
     }
 }
diff --git a/src/main/java/dm/earth/cabricality/content/core/threads/AndesiteThread.java b/src/main/java/dm/earth/cabricality/content/core/threads/AndesiteThread.java
@@ -5,13 +5,6 @@
 import dm.earth.cabricality.lib.math.RecipeBuilderUtil;
 import dm.earth.cabricality.lib.resource.data.core.FreePRP;
 import dm.earth.cabricality.tweak.base.MechAndSmithCraft;
-import com.simibubi.create.content.kinetics.deployer.DeployerApplicationRecipe;
-import com.simibubi.create.content.kinetics.mixer.CompactingRecipe;
-import com.simibubi.create.content.kinetics.mixer.MixingRecipe;
-import com.simibubi.create.content.kinetics.saw.CuttingRecipe;
-import com.simibubi.create.content.processing.recipe.ProcessingOutput;
-import com.simibubi.create.content.processing.sequenced.SequencedAssemblyRecipeBuilder;
-import com.simibubi.create.foundation.fluid.FluidIngredient;
 import net.fabricmc.fabric.api.transfer.v1.fluid.FluidConstants;
 import net.minecraft.fluid.Fluids;
 import net.minecraft.item.ItemStack;
@@ -100,6 +93,7 @@ public void addRecipes(AddRecipesCallback.@NotNull RecipeHandler handler) {
 						.build(id, "")
 		);
 
+		/*
 		handler.register(
 				recipeId("mixing", "algal_blend"),
 				id -> new MixingRecipe(new FreePRP(id)
@@ -116,6 +110,8 @@ public void addRecipes(AddRecipesCallback.@NotNull RecipeHandler handler) {
 				)
 		);
 
+		 */
+
 		handler.register(
 				recipeId("crafting", "kinetic_mechanism"),
 				id -> VanillaRecipeBuilders
@@ -137,6 +133,7 @@ public void addRecipes(AddRecipesCallback.@NotNull RecipeHandler handler) {
 				)
 		);
 
+		/*
 		handler.register(
 				recipeId("compacting", "dripstone_block"),
 				id -> new CompactingRecipe(new FreePRP(id)
@@ -157,6 +154,8 @@ public void addRecipes(AddRecipesCallback.@NotNull RecipeHandler handler) {
 						.build()
 		);
 
+		 */
+
 		handler.register(
 				recipeId("crafting", "saw_blade"),
 				id -> VanillaRecipeBuilders

diff --git a/src/main/java/dm/earth/cabricality/content/core/threads/BrassThread.java b/src/main/java/dm/earth/cabricality/content/core/threads/BrassThread.java
@@ -2,19 +2,10 @@
 
 import dm.earth.cabricality.content.core.TechThread;
 import dm.earth.cabricality.content.entries.CabfFluids;
-import dm.earth.cabricality.lib.math.ListUtil;
 import dm.earth.cabricality.lib.math.RecipeBuilderUtil;
 import dm.earth.cabricality.lib.resource.data.core.FreePRP;
 import dm.earth.cabricality.tweak.base.MechAndSmithCraft;
-import com.simibubi.create.content.fluids.transfer.FillingRecipe;
-import com.simibubi.create.content.kinetics.millstone.MillingRecipe;
-import com.simibubi.create.content.kinetics.mixer.MixingRecipe;
-import com.simibubi.create.content.processing.recipe.ProcessingOutput;
-import com.simibubi.create.foundation.fluid.FluidIngredient;
-import io.github.fabricators_of_create.porting_lib.fluids.FluidStack;
 import net.fabricmc.fabric.api.transfer.v1.fluid.FluidConstants;
-import net.fabricmc.fabric.api.transfer.v1.fluid.FluidVariant;
-import net.minecraft.fluid.Fluids;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.item.Items;
@@ -39,6 +30,7 @@
 public class BrassThread implements TechThread {
 	@Override
 	public void addRecipes(AddRecipesCallback.RecipeHandler handler) {
+		/*
 		handler.register(
 				recipeId("milling", "sky_stone_block"),
 				id -> new MillingRecipe(new FreePRP(id)
@@ -49,6 +41,8 @@ public void addRecipes(AddRecipesCallback.RecipeHandler handler) {
 						).setProcessingTime(350))
 		);
 
+		 */
+
 		Item redstone = Items.REDSTONE;
 		handler.register(
 				recipeId("crafting", "rose_quartz"),
@@ -102,6 +96,7 @@ public void addRecipes(AddRecipesCallback.RecipeHandler handler) {
 
 		 */
 
+		/*
 		handler.register(
 				recipeId("mixing", "polished_rose_quartz"),
 				id -> new MixingRecipe(new FreePRP(id)
@@ -118,6 +113,8 @@ public void addRecipes(AddRecipesCallback.RecipeHandler handler) {
 						.setResult(new ProcessingOutput(CR.asItem("electron_tube").getDefaultStack(), 1)))
 		);
 
+		 */
+
 		handler.register(
 				recipeId("crafting", "brass_machine"),
 				id -> RecipeBuilderUtil.donutRecipe(
@@ -131,6 +128,7 @@ public void addRecipes(AddRecipesCallback.RecipeHandler handler) {
 	}
 
 	private void registerCrystalProcess(AddRecipesCallback.RecipeHandler handler, Item crystal, Item seed, Item dust) {
+		/*
 		handler.register(recipeId("milling", Registries.ITEM.getId(crystal).getPath()),
 				id -> new MillingRecipe(
 						new FreePRP(id)
@@ -151,6 +149,8 @@ private void registerCrystalProcess(AddRecipesCallback.RecipeHandler handler, It
 						false
 				)
 		);
+
+		 */
 	}
 
 	@Override

diff --git a/src/main/java/dm/earth/cabricality/content/core/threads/CopperThread.java b/src/main/java/dm/earth/cabricality/content/core/threads/CopperThread.java
@@ -6,9 +6,6 @@
 import dm.earth.cabricality.lib.math.RecipeBuilderUtil;
 import dm.earth.cabricality.lib.resource.data.core.FreePRP;
 import dm.earth.cabricality.tweak.base.MechAndSmithCraft;
-import com.simibubi.create.content.kinetics.mixer.CompactingRecipe;
-import com.simibubi.create.content.processing.recipe.ProcessingOutput;
-import com.simibubi.create.foundation.fluid.FluidIngredient;
 import net.fabricmc.fabric.api.transfer.v1.fluid.FluidConstants;
 import net.minecraft.fluid.Fluids;
 import net.minecraft.item.ItemStack;
@@ -76,6 +73,7 @@ public void addRecipes(AddRecipesCallback.@NotNull RecipeHandler handler) {
 				)
 		);
 
+		/*
 		handler.register(
 				recipeId("compacting", "rubber"),
 				id -> new CompactingRecipe(new FreePRP(id)
@@ -104,6 +102,8 @@ public void addRecipes(AddRecipesCallback.@NotNull RecipeHandler handler) {
 						)
 						.setResult(new ProcessingOutput(CabfItems.RUBBER.getDefaultStack(), 1)))
 		);
+
+		 */
 	}
 
 	@Override

diff --git a/src/main/java/dm/earth/cabricality/content/core/threads/EnderiumThread.java b/src/main/java/dm/earth/cabricality/content/core/threads/EnderiumThread.java
@@ -4,7 +4,6 @@
 import dm.earth.cabricality.lib.math.RecipeBuilderUtil;
 import dm.earth.cabricality.lib.resource.data.core.FreePRP;
 import dm.earth.cabricality.tweak.base.MechAndSmithCraft;
-import com.simibubi.create.content.kinetics.deployer.ManualApplicationRecipe;
 import net.fabricmc.fabric.api.transfer.v1.fluid.FluidConstants;
 import net.minecraft.recipe.RecipeManager;
 import net.minecraft.util.Identifier;
@@ -55,12 +54,15 @@ public void addRecipes(AddRecipesCallback.RecipeHandler handler) {
 				))
 		);
 
+		/*
 		handler.register(
 				recipeId("item_application", "enderium_casing"),
 				id -> new ManualApplicationRecipe(new FreePRP(id)
 						.setIngredient(MC.asIngredient("obsidian"), CABF.asIngredient("enderium_ingot"))
 						.setResult(CABF.asProcessingOutput("enderium_casing")))
 		);
+
+		 */
 	}
 
 	@Override

diff --git a/src/main/java/dm/earth/cabricality/content/core/threads/FluixThread.java b/src/main/java/dm/earth/cabricality/content/core/threads/FluixThread.java
@@ -7,17 +7,6 @@
 import dm.earth.cabricality.lib.resource.data.core.FreePRP;
 import dm.earth.cabricality.lib.util.ArrayUtil;
 import dm.earth.cabricality.tweak.base.MechAndSmithCraft;
-import com.simibubi.create.content.fluids.transfer.EmptyingRecipe;
-import com.simibubi.create.content.fluids.transfer.FillingRecipe;
-import com.simibubi.create.content.kinetics.crusher.CrushingRecipe;
-import com.simibubi.create.content.kinetics.deployer.DeployerApplicationRecipe;
-import com.simibubi.create.content.kinetics.deployer.ManualApplicationRecipe;
-import com.simibubi.create.content.kinetics.fan.SplashingRecipe;
-import com.simibubi.create.content.kinetics.mixer.CompactingRecipe;
-import com.simibubi.create.content.kinetics.mixer.MixingRecipe;
-import com.simibubi.create.content.processing.recipe.HeatCondition;
-import com.simibubi.create.foundation.fluid.FluidIngredient;
-import io.github.fabricators_of_create.porting_lib.fluids.FluidStack;
 import me.steven.indrev.recipes.machines.FluidInfuserRecipe;
 import me.steven.indrev.recipes.machines.entries.InputEntry;
 import me.steven.indrev.recipes.machines.entries.OutputEntry;
@@ -123,6 +112,7 @@ public void addRecipes(AddRecipesCallback.RecipeHandler handler) {
 						.build(id, "")
 		);
 
+		/*
 		handler.register(
 				recipeId("deploying", "printed_silicon"),
 				id -> new DeployerApplicationRecipe(new FreePRP(id)
@@ -157,9 +147,12 @@ public void addRecipes(AddRecipesCallback.RecipeHandler handler) {
 						.setProcessingTime(350))
 		);
 
+		 */
+
 		var blizz = CABF.asIngredient("blizz_powder");
 		var basalz = CABF.asIngredient("basalz_powder");
 
+		/*
 		handler.register(
 				recipeId("splashing", "sandstone"),
 				id -> new SplashingRecipe(new FreePRP(id)
@@ -181,6 +174,8 @@ public void addRecipes(AddRecipesCallback.RecipeHandler handler) {
 						.setResult(CABF.asProcessingOutput("earth_charge")))
 		);
 
+		 */
+
 		// Coke Processing
 		/*
 		handler.register(
@@ -193,6 +188,7 @@ public void addRecipes(AddRecipesCallback.RecipeHandler handler) {
 
 		 */
 
+		/*
 		handler.register(
 				recipeId("filling", "coal"),
 				id -> new FillingRecipe(new FreePRP(id)
@@ -209,6 +205,8 @@ public void addRecipes(AddRecipesCallback.RecipeHandler handler) {
 						.setResult(MC.asProcessingOutput("coal")))
 		);
 
+		 */
+
 		/*
 		handler.register(
 				recipeId("emptying", "sand_ball"),
@@ -220,6 +218,7 @@ public void addRecipes(AddRecipesCallback.RecipeHandler handler) {
 
 		 */
 
+		/*
 		handler.register(
 				recipeId("compacting", "silicon_compound"),
 				id -> new CompactingRecipe(new FreePRP(id)
@@ -265,6 +264,8 @@ public void addRecipes(AddRecipesCallback.RecipeHandler handler) {
 						.setResult(CABF.asProcessingOutput("fluix_casing")))
 		);
 
+		 */
+
 		handler.register(
 				recipeId("fluid_infuse", "snow"),
 				id -> new FluidInfuserRecipe(id,