Revert some stupid changes + fix crashes + fix some bugs

StockiesLad · Nov 19, 2022 · 6d4ec45 · 6d4ec45
1 parent d5f6042
commit 6d4ec45
Show file tree

Hide file tree

Showing 10 changed files with 196 additions and 108 deletions.
diff --git a/src/main/java/com/mrh0/createaddition/CreateAddition.java b/src/main/java/com/mrh0/createaddition/CreateAddition.java
@@ -15,12 +15,9 @@
 import net.fabricmc.loader.api.FabricLoader;
 import net.minecraftforge.api.ModLoadingContext;
 import net.minecraftforge.fml.config.ModConfig;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
 
 public class CreateAddition implements ModInitializer {
-    public static final Logger LOGGER = LogManager.getLogger();
-
+
     public static final String MODID = "createaddition";
 
     public static boolean IE_ACTIVE = false;
@@ -69,19 +66,7 @@ public void onInitialize() {
     }
 
     public void postInit() {
-    	int i = 0;
         CANetwork.initServer();
-
-
-        /*
-        FurnaceEngineInteractions.registerHandler(CABlocks.FURNACE_BURNER.get(), FurnaceEngineInteractions.InteractionHandler.of(
-       		 s -> s.getBlock() instanceof FurnaceBurner && s.hasProperty(FurnaceBurner.LIT) ? 
-       		 (s.getValue(FurnaceBurner.LIT) ? HeatSource.ACTIVE : HeatSource.VALID) : HeatSource.EMPTY, s -> (float)(double)Config.FURNACE_BURNER_ENGINE_SPEED.get()));
-        
-        FurnaceEngineInteractions.registerHandler(CABlocks.CRUDE_BURNER.get(), FurnaceEngineInteractions.InteractionHandler.of(
-          		 s -> s.getBlock() instanceof CrudeBurner && s.hasProperty(CrudeBurner.LIT) ? 
-          	       		 (s.getValue(CrudeBurner.LIT) ? HeatSource.ACTIVE : HeatSource.VALID) : HeatSource.EMPTY, s -> (float)(double)Config.CRUDE_BURNER_ENGINE_SPEED.get()));
-        */
     	System.out.println("Create Crafts & Addition Initialized!");
     }
 

diff --git a/.../java/com/mrh0/createaddition/blocks/liquid_blaze_burner/LiquidBlazeBurnerTileEntity.java b/.../java/com/mrh0/createaddition/blocks/liquid_blaze_burner/LiquidBlazeBurnerTileEntity.java
@@ -145,6 +145,7 @@ public boolean isCreativeFuel(ItemStack stack) {
 		return AllItems.CREATIVE_BLAZE_CAKE.isIn(stack);
 	}
 
+
 	@Override
 	public void tick() {
 		super.tick();
@@ -161,7 +162,14 @@ public void tick() {
 
 		if (isCreative)
 			return;
-		if (fluidTank.getFluidAmount() >= 8100 && remainingBurnTime <= 200 && !Transaction.isOpen()) {
+		if (	!Transaction.isOpen() &&
+				fluidTank.getFluidAmount() >= 8100 &&
+				remainingBurnTime <= 200 &&
+				(
+						fluidTank.getFluid().isFluidEqual(new FluidStack(CAFluids.BIOETHANOL.getSource()).getType()) ||
+						fluidTank.getFluid().isFluidEqual(new FluidStack(CAFluids.SEED_OIL.getSource()).getType())
+				)
+		) {
 			Transaction transaction = Transaction.openOuter();
 			fluidTank.extract(fluidTank.variant, 8100, transaction);
 			transaction.commit();
@@ -311,10 +319,10 @@ private boolean tryUpdateLiquid(ItemStack itemStack, Player player) {
 		if (bl) {
 			assert level != null;
 			if (currentItem == seedOilBucket) {
-				fluidTank.setFluid(CAFluids.SEED_OIL_FLUID_STACK);
+				fluidTank.setFluid(new FluidStack(CAFluids.SEED_OIL.getSource().getSource(), 1000));
 			}
 			if (currentItem == bioethanolBucket) {
-				fluidTank.setFluid(CAFluids.BIOETHANOL_FLUID_STACK);
+				fluidTank.setFluid(new FluidStack(CAFluids.BIOETHANOL.getSource().getSource(), 1000));
 			}
 			level.playSound(player, getBlockPos(), SoundEvents.BUCKET_EMPTY, SoundSource.BLOCKS, .125f + level.random.nextFloat() * .125f, .75f - level.random.nextFloat() * .25f);
 			if (level.isClientSide) {

diff --git a/src/main/java/com/mrh0/createaddition/index/CAFluids.java b/src/main/java/com/mrh0/createaddition/index/CAFluids.java
@@ -5,7 +5,6 @@
 import com.simibubi.create.foundation.data.CreateRegistrate;
 import com.tterrag.registrate.fabric.SimpleFlowableFluid;
 import com.tterrag.registrate.util.entry.FluidEntry;
-import io.github.fabricators_of_create.porting_lib.util.FluidStack;
 import net.fabricmc.fabric.api.transfer.v1.fluid.FluidConstants;
 import net.fabricmc.fabric.api.transfer.v1.fluid.FluidStorage;
 import net.fabricmc.fabric.api.transfer.v1.fluid.FluidVariant;
@@ -31,8 +30,6 @@ public static void register() {}
 
 	public static final FluidEntry<SimpleFlowableFluid.Flowing> BIOETHANOL;
 	public static final FluidEntry<SimpleFlowableFluid.Flowing> SEED_OIL;
-	public static final FluidStack BIOETHANOL_FLUID_STACK;
-	public static final FluidStack SEED_OIL_FLUID_STACK;
 
 	static  {
 		BIOETHANOL = REGISTRATE
@@ -72,9 +69,6 @@ public static void register() {}
 					FluidStorage.combinedItemApiProvider(BUCKET).register(context ->
 							new EmptyItemFluidStorage(context, bucket -> ItemVariant.of(source.getBucket()), source, FluidConstants.BUCKET));
 				}).register();
-
-		BIOETHANOL_FLUID_STACK = new FluidStack(BIOETHANOL.getSource().getSource(), 81000);
-		SEED_OIL_FLUID_STACK = new FluidStack(BIOETHANOL.getSource().getSource(), 81000);
 	}
 
 

diff --git a/src/main/resources/assets/createaddition/lang/de_de.json b/src/main/resources/assets/createaddition/lang/de_de.json
@@ -3,7 +3,6 @@
 	"createaddition.tooltip.energy.consumption": "Energie Nutzung:",
 	"createaddition.tooltip.energy.production": "Energie Generiert:",
 	"createaddition.recipe.rolling": "Walzen",
-	"createaddition.recipe.rolling.sequence": "Walzen in der Walze",
 
 	"desc.immersiveengineering.info.mineral.sphalerite": "Sphalerit",
 
@@ -152,7 +151,7 @@
 
 	"block.createaddition.seed_oil": "Samen-Öl",
 
-	"itemGroup.createaddition:main":"Create Crafts & Additions",
+	"itemGroup.createaddition.main":"Create Crafts & Additions",
 
 	"createaddition.command.cca_api.link": "Klick hier für eine Api Dokumentation",