From f957e697d909c1749aadfb5432a78786eceb8989 Mon Sep 17 00:00:00 2001 From: DaCodia Date: Tue, 6 Aug 2024 23:57:00 -0500 Subject: [PATCH] 51 left YIPEE --- .../createindustry/base/GasFluidBuilder.java | 13 +- .../TFMGCreativeModeTab.java | 5 +- .../palettes/TFMGPaletteBlockPattern.java | 6 +- .../base/util/spark/BlueSparkRenderer.java | 6 +- .../base/util/spark/GreenSparkRenderer.java | 6 +- .../base/util/spark/SparkRenderer.java | 6 +- .../blocks/electricity/api/Energy.java | 33 +++++ .../blocks/electricity/api/EnergyStorage.java | 24 ++++ .../cables/CableConnectorBlockEntity.java | 4 +- .../diesel/DieselEngineBlockEntity.java | 2 +- .../blocks/tanks/SteelFluidTankRenderer.java | 4 +- .../blocks/tanks/SteelTankBlockEntity.java | 7 +- .../blocks/tanks/SteelTankItem.java | 4 +- .../items/BadFuelBucketItem.java | 22 --- .../items/CoalCokeBlockItem.java | 25 ---- .../createindustry/items/CoalCokeItem.java | 19 --- .../createindustry/items/FossilstoneItem.java | 25 ---- .../createindustry/items/OilBucketItem.java | 21 --- .../AdvancedPotatoCannonPacket.java | 8 +- .../projectile/NapalmPotatoRenderer.java | 6 +- .../explosives/napalm/NapalmBombRenderer.java | 6 +- .../pipe_bomb/PipeBombRenderer.java | 6 +- .../ThermiteGrenadeRenderer.java | 6 +- .../thermite_grenades/fire/BlueFireBlock.java | 5 +- .../fire/GreenFireBlock.java | 5 +- .../flamethrover/FlamethrowerItem.java | 6 +- .../flamethrover/FlamethrowerPacket.java | 8 +- .../lithium_blade/LithiumBladeItem.java | 5 +- .../lithium_blade/LithiumSparkRenderer.java | 6 +- .../QuadPotatoCannonPacket.java | 8 +- .../mixins/FluidPropagatorMixin.java | 38 ++---- .../mixins/PipeAttachmentModelMixin.java | 127 ------------------ .../recipes/casting/CastingRecipe.java | 5 +- .../jei/AdvancedDistillationCategory.java | 6 +- .../jei/IndustrialBlastingCategory.java | 7 +- .../recipes/jei/machines/CokeOven.java | 14 -- .../createindustry/registry/TFMGBlocks.java | 7 +- .../createindustry/registry/TFMGFuels.java | 2 + .../resources/createindustry.accesswidener | 1 + 39 files changed, 147 insertions(+), 367 deletions(-) create mode 100644 src/main/java/com/drmangotea/createindustry/blocks/electricity/api/Energy.java create mode 100644 src/main/java/com/drmangotea/createindustry/blocks/electricity/api/EnergyStorage.java delete mode 100644 src/main/java/com/drmangotea/createindustry/items/BadFuelBucketItem.java delete mode 100644 src/main/java/com/drmangotea/createindustry/items/CoalCokeBlockItem.java delete mode 100644 src/main/java/com/drmangotea/createindustry/items/CoalCokeItem.java delete mode 100644 src/main/java/com/drmangotea/createindustry/items/FossilstoneItem.java delete mode 100644 src/main/java/com/drmangotea/createindustry/items/OilBucketItem.java delete mode 100644 src/main/java/com/drmangotea/createindustry/mixins/PipeAttachmentModelMixin.java diff --git a/src/main/java/com/drmangotea/createindustry/base/GasFluidBuilder.java b/src/main/java/com/drmangotea/createindustry/base/GasFluidBuilder.java index 6d3e3cdb..0e2ae8b5 100644 --- a/src/main/java/com/drmangotea/createindustry/base/GasFluidBuilder.java +++ b/src/main/java/com/drmangotea/createindustry/base/GasFluidBuilder.java @@ -3,18 +3,17 @@ package com.drmangotea.createindustry.base; import com.tterrag.registrate.AbstractRegistrate; import com.tterrag.registrate.builders.BuilderCallback; import com.tterrag.registrate.builders.FluidBuilder; +import com.tterrag.registrate.fabric.SimpleFlowableFluid; import com.tterrag.registrate.util.nullness.NonNullFunction; import com.tterrag.registrate.util.nullness.NonNullSupplier; import net.minecraft.resources.ResourceLocation; -import net.minecraftforge.fluids.ForgeFlowingFluid; -import net.minecraftforge.fluids.ForgeFlowingFluid.Properties; -public class GasFluidBuilder extends FluidBuilder { +public class GasFluidBuilder extends FluidBuilder { public GasFluidBuilder(AbstractRegistrate owner, P parent, String name, BuilderCallback callback, - ResourceLocation stillTexture, ResourceLocation flowingTexture, FluidBuilder.FluidTypeFactory typeFactory, - NonNullFunction factory) { - super(owner, parent, name, callback, stillTexture, flowingTexture, typeFactory, factory); + ResourceLocation stillTexture, ResourceLocation flowingTexture, + NonNullFunction factory) { + super(owner, parent, name, callback, stillTexture, flowingTexture, factory); source(factory); } @@ -23,6 +22,4 @@ public class GasFluidBuilder extends FluidBuilde return this::getEntry; } - - } \ No newline at end of file diff --git a/src/main/java/com/drmangotea/createindustry/base/creative_mode_tabs/TFMGCreativeModeTab.java b/src/main/java/com/drmangotea/createindustry/base/creative_mode_tabs/TFMGCreativeModeTab.java index a965a711..192a9c47 100644 --- a/src/main/java/com/drmangotea/createindustry/base/creative_mode_tabs/TFMGCreativeModeTab.java +++ b/src/main/java/com/drmangotea/createindustry/base/creative_mode_tabs/TFMGCreativeModeTab.java @@ -3,17 +3,18 @@ package com.drmangotea.createindustry.base.creative_mode_tabs; import java.util.Collection; import com.drmangotea.createindustry.CreateTFMG; +import com.simibubi.create.compat.jei.CreateJEI; import com.tterrag.registrate.util.entry.RegistryEntry; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.entity.ItemRenderer; import net.minecraft.client.resources.model.BakedModel; import net.minecraft.core.NonNullList; +import net.minecraft.core.Registry; import net.minecraft.world.item.BlockItem; import net.minecraft.world.item.CreativeModeTab; import net.minecraft.world.item.Item; import net.minecraft.world.item.ItemStack; -import net.minecraftforge.registries.ForgeRegistries; public abstract class TFMGCreativeModeTab extends CreativeModeTab { public TFMGCreativeModeTab(String id) { @@ -28,7 +29,7 @@ public abstract class TFMGCreativeModeTab extends CreativeModeTab { } protected Collection> registeredItems() { - return CreateTFMG.REGISTRATE.getAll(ForgeRegistries.ITEMS.getRegistryKey()); + return CreateTFMG.REGISTRATE.getAll(Registry.ITEM.key()); } public void addBlocks(NonNullList items) { diff --git a/src/main/java/com/drmangotea/createindustry/base/palettes/TFMGPaletteBlockPattern.java b/src/main/java/com/drmangotea/createindustry/base/palettes/TFMGPaletteBlockPattern.java index c25d8b7b..6a25c301 100644 --- a/src/main/java/com/drmangotea/createindustry/base/palettes/TFMGPaletteBlockPattern.java +++ b/src/main/java/com/drmangotea/createindustry/base/palettes/TFMGPaletteBlockPattern.java @@ -10,6 +10,8 @@ import com.tterrag.registrate.providers.RegistrateRecipeProvider; import com.tterrag.registrate.util.nullness.NonNullBiConsumer; import com.tterrag.registrate.util.nullness.NonNullFunction; import com.tterrag.registrate.util.nullness.NonNullSupplier; +import net.fabricmc.api.EnvType; +import net.fabricmc.api.Environment; import net.minecraft.client.renderer.RenderType; import net.minecraft.core.Direction; import net.minecraft.resources.ResourceLocation; @@ -18,8 +20,6 @@ import net.minecraft.world.item.Item; import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.state.BlockBehaviour; import net.minecraft.world.level.block.state.properties.BlockStateProperties; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; import net.minecraftforge.client.model.generators.ConfiguredModel; import java.util.Optional; @@ -74,7 +74,7 @@ public class TFMGPaletteBlockPattern { private NonNullFunction, NonNullBiConsumer, RegistrateRecipeProvider>> additionalRecipes; private TFMGPaletteBlockPartial[] partials; - @OnlyIn(Dist.CLIENT) + @Environment(EnvType.CLIENT) private RenderType renderType; private static TFMGPaletteBlockPattern create(String name, TFMGPaletteBlockPattern.PatternNameType nameType, diff --git a/src/main/java/com/drmangotea/createindustry/base/util/spark/BlueSparkRenderer.java b/src/main/java/com/drmangotea/createindustry/base/util/spark/BlueSparkRenderer.java index 80b59b90..373a4587 100644 --- a/src/main/java/com/drmangotea/createindustry/base/util/spark/BlueSparkRenderer.java +++ b/src/main/java/com/drmangotea/createindustry/base/util/spark/BlueSparkRenderer.java @@ -6,6 +6,8 @@ import com.mojang.blaze3d.vertex.VertexConsumer; import com.mojang.math.Matrix3f; import com.mojang.math.Matrix4f; import com.mojang.math.Vector3f; +import net.fabricmc.api.EnvType; +import net.fabricmc.api.Environment; import net.minecraft.client.renderer.MultiBufferSource; import net.minecraft.client.renderer.RenderType; import net.minecraft.client.renderer.entity.EntityRenderer; @@ -13,10 +15,8 @@ import net.minecraft.client.renderer.entity.EntityRendererProvider; import net.minecraft.client.renderer.texture.OverlayTexture; import net.minecraft.core.BlockPos; import net.minecraft.resources.ResourceLocation; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; -@OnlyIn(Dist.CLIENT) +@Environment(EnvType.CLIENT) public class BlueSparkRenderer extends EntityRenderer { private static final ResourceLocation TEXTURE_LOCATION = CreateTFMG.asResource("textures/entity/blue_spark.png"); private static final RenderType RENDER_TYPE = RenderType.entityCutoutNoCull(TEXTURE_LOCATION); diff --git a/src/main/java/com/drmangotea/createindustry/base/util/spark/GreenSparkRenderer.java b/src/main/java/com/drmangotea/createindustry/base/util/spark/GreenSparkRenderer.java index 3e1f8664..690d1f6a 100644 --- a/src/main/java/com/drmangotea/createindustry/base/util/spark/GreenSparkRenderer.java +++ b/src/main/java/com/drmangotea/createindustry/base/util/spark/GreenSparkRenderer.java @@ -6,6 +6,8 @@ import com.mojang.blaze3d.vertex.VertexConsumer; import com.mojang.math.Matrix3f; import com.mojang.math.Matrix4f; import com.mojang.math.Vector3f; +import net.fabricmc.api.EnvType; +import net.fabricmc.api.Environment; import net.minecraft.client.renderer.MultiBufferSource; import net.minecraft.client.renderer.RenderType; import net.minecraft.client.renderer.entity.EntityRenderer; @@ -13,10 +15,8 @@ import net.minecraft.client.renderer.entity.EntityRendererProvider; import net.minecraft.client.renderer.texture.OverlayTexture; import net.minecraft.core.BlockPos; import net.minecraft.resources.ResourceLocation; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; -@OnlyIn(Dist.CLIENT) +@Environment(EnvType.CLIENT) public class GreenSparkRenderer extends EntityRenderer { private static final ResourceLocation TEXTURE_LOCATION = CreateTFMG.asResource("textures/entity/green_spark.png"); private static final RenderType RENDER_TYPE = RenderType.entityCutoutNoCull(TEXTURE_LOCATION); diff --git a/src/main/java/com/drmangotea/createindustry/base/util/spark/SparkRenderer.java b/src/main/java/com/drmangotea/createindustry/base/util/spark/SparkRenderer.java index 7f8d10a7..2cb90dc4 100644 --- a/src/main/java/com/drmangotea/createindustry/base/util/spark/SparkRenderer.java +++ b/src/main/java/com/drmangotea/createindustry/base/util/spark/SparkRenderer.java @@ -5,6 +5,8 @@ import com.mojang.blaze3d.vertex.VertexConsumer; import com.mojang.math.Matrix3f; import com.mojang.math.Matrix4f; import com.mojang.math.Vector3f; +import net.fabricmc.api.EnvType; +import net.fabricmc.api.Environment; import net.minecraft.client.renderer.MultiBufferSource; import net.minecraft.client.renderer.RenderType; import net.minecraft.client.renderer.entity.EntityRenderer; @@ -12,10 +14,8 @@ import net.minecraft.client.renderer.entity.EntityRendererProvider; import net.minecraft.client.renderer.texture.OverlayTexture; import net.minecraft.core.BlockPos; import net.minecraft.resources.ResourceLocation; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; -@OnlyIn(Dist.CLIENT) +@Environment(EnvType.CLIENT) public class SparkRenderer extends EntityRenderer { private static final ResourceLocation TEXTURE_LOCATION = new ResourceLocation("textures/particle/lava.png"); private static final RenderType RENDER_TYPE = RenderType.entityCutoutNoCull(TEXTURE_LOCATION); diff --git a/src/main/java/com/drmangotea/createindustry/blocks/electricity/api/Energy.java b/src/main/java/com/drmangotea/createindustry/blocks/electricity/api/Energy.java new file mode 100644 index 00000000..1d3f7082 --- /dev/null +++ b/src/main/java/com/drmangotea/createindustry/blocks/electricity/api/Energy.java @@ -0,0 +1,33 @@ +package com.drmangotea.createindustry.blocks.electricity.api; + +import net.fabricmc.fabric.api.transfer.v1.storage.TransferVariant; +import net.minecraft.nbt.CompoundTag; +import net.minecraft.network.FriendlyByteBuf; +import org.jetbrains.annotations.Nullable; + +public class Energy implements TransferVariant { + @Override + public boolean isBlank() { + return false; + } + + @Override + public Double getObject() { + return null; + } + + @Override + public @Nullable CompoundTag getNbt() { + return null; + } + + @Override + public CompoundTag toNbt() { + return null; + } + + @Override + public void toPacket(FriendlyByteBuf buf) { + + } +} diff --git a/src/main/java/com/drmangotea/createindustry/blocks/electricity/api/EnergyStorage.java b/src/main/java/com/drmangotea/createindustry/blocks/electricity/api/EnergyStorage.java new file mode 100644 index 00000000..ecb5e4d3 --- /dev/null +++ b/src/main/java/com/drmangotea/createindustry/blocks/electricity/api/EnergyStorage.java @@ -0,0 +1,24 @@ +package com.drmangotea.createindustry.blocks.electricity.api; + +import net.fabricmc.fabric.api.transfer.v1.storage.base.SingleVariantStorage; +import org.jetbrains.annotations.ApiStatus; + +@ApiStatus.Experimental +public class EnergyStorage extends SingleVariantStorage { + + + public EnergyStorage(long i) { + this.variant = new Energy(); + this.amount = i; + } + + @Override + protected Energy getBlankVariant() { + return null; + } + + @Override + protected long getCapacity(Energy variant) { + return 0; + } +} diff --git a/src/main/java/com/drmangotea/createindustry/blocks/electricity/base/cables/CableConnectorBlockEntity.java b/src/main/java/com/drmangotea/createindustry/blocks/electricity/base/cables/CableConnectorBlockEntity.java index 1b0deae0..d23cefa8 100644 --- a/src/main/java/com/drmangotea/createindustry/blocks/electricity/base/cables/CableConnectorBlockEntity.java +++ b/src/main/java/com/drmangotea/createindustry/blocks/electricity/base/cables/CableConnectorBlockEntity.java @@ -1,6 +1,7 @@ package com.drmangotea.createindustry.blocks.electricity.base.cables; import com.drmangotea.createindustry.base.TFMGTools; +import com.drmangotea.createindustry.blocks.electricity.api.EnergyStorage; import com.drmangotea.createindustry.blocks.electricity.base.*; import com.drmangotea.createindustry.blocks.electricity.resistors.ResistorBlockEntity; import com.drmangotea.createindustry.registry.TFMGItems; @@ -217,8 +218,7 @@ public class CableConnectorBlockEntity extends ElectricBlockEntity { - }else - if(be1!=null) { + } else if(be1!=null) { if (be1.getCapability(ForgeCapabilities.ENERGY, direction.getOpposite()).isPresent()) { diff --git a/src/main/java/com/drmangotea/createindustry/blocks/engines/diesel/DieselEngineBlockEntity.java b/src/main/java/com/drmangotea/createindustry/blocks/engines/diesel/DieselEngineBlockEntity.java index f9f63838..01173a2b 100644 --- a/src/main/java/com/drmangotea/createindustry/blocks/engines/diesel/DieselEngineBlockEntity.java +++ b/src/main/java/com/drmangotea/createindustry/blocks/engines/diesel/DieselEngineBlockEntity.java @@ -415,7 +415,7 @@ public class DieselEngineBlockEntity extends SmartBlockEntity implements IHaveGo @Nullable - @OnlyIn(Dist.CLIENT) + @Environment(EnvType.CLIENT) public Float getTargetAngle() { float angle = 0; BlockState blockState = getBlockState(); diff --git a/src/main/java/com/drmangotea/createindustry/blocks/tanks/SteelFluidTankRenderer.java b/src/main/java/com/drmangotea/createindustry/blocks/tanks/SteelFluidTankRenderer.java index 77c47c91..aa9851df 100644 --- a/src/main/java/com/drmangotea/createindustry/blocks/tanks/SteelFluidTankRenderer.java +++ b/src/main/java/com/drmangotea/createindustry/blocks/tanks/SteelFluidTankRenderer.java @@ -55,9 +55,7 @@ public class SteelFluidTankRenderer extends SafeBlockEntityRenderer 0) - tankInventory.drain(overflow, FluidAction.EXECUTE); + tankInventory.extract(tankInventory.variant, overflow, Transaction.openOuter()); forceFluidLevelUpdate = true; } diff --git a/src/main/java/com/drmangotea/createindustry/blocks/tanks/SteelTankItem.java b/src/main/java/com/drmangotea/createindustry/blocks/tanks/SteelTankItem.java index d43eb76f..ad0f8ae5 100644 --- a/src/main/java/com/drmangotea/createindustry/blocks/tanks/SteelTankItem.java +++ b/src/main/java/com/drmangotea/createindustry/blocks/tanks/SteelTankItem.java @@ -121,10 +121,10 @@ public class SteelTankItem extends BlockItem { if (SteelTankBlock.isTank(blockState)) continue; BlockPlaceContext context = BlockPlaceContext.at(ctx, offsetPos, face); - player.getPersistentData() + player.getExtraCustomData() .putBoolean("SilenceTankSound", true); super.place(context); - player.getPersistentData() + player.getExtraCustomData() .remove("SilenceTankSound"); } } diff --git a/src/main/java/com/drmangotea/createindustry/items/BadFuelBucketItem.java b/src/main/java/com/drmangotea/createindustry/items/BadFuelBucketItem.java deleted file mode 100644 index d2036337..00000000 --- a/src/main/java/com/drmangotea/createindustry/items/BadFuelBucketItem.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.drmangotea.createindustry.items; - -import net.minecraft.world.item.BucketItem; -import net.minecraft.world.item.Item; -import net.minecraft.world.item.ItemStack; -import net.minecraft.world.item.crafting.RecipeType; -import net.minecraft.world.level.material.Fluid; -import org.jetbrains.annotations.Nullable; - -public class BadFuelBucketItem extends BucketItem { - public BadFuelBucketItem(Fluid p_40689_, Properties p_40690_) { - super(p_40689_, p_40690_); - } - public BadFuelBucketItem(java.util.function.Supplier supplier, Item.Properties builder) { - super(supplier,builder); - } - - @Override - public int getBurnTime(ItemStack itemStack, @Nullable RecipeType recipeType) { - return 200; - } -} diff --git a/src/main/java/com/drmangotea/createindustry/items/CoalCokeBlockItem.java b/src/main/java/com/drmangotea/createindustry/items/CoalCokeBlockItem.java deleted file mode 100644 index 28ec7e88..00000000 --- a/src/main/java/com/drmangotea/createindustry/items/CoalCokeBlockItem.java +++ /dev/null @@ -1,25 +0,0 @@ -package com.drmangotea.createindustry.items; - -import net.minecraft.world.item.BlockItem; -import net.minecraft.world.item.ItemStack; -import net.minecraft.world.item.crafting.RecipeType; -import net.minecraft.world.level.block.Block; -import org.jetbrains.annotations.Nullable; - -public class CoalCokeBlockItem extends BlockItem { - - - - - public CoalCokeBlockItem(Block p_40565_, Properties p_40566_) { - super(p_40565_, p_40566_); - - } - - - - @Override - public int getBurnTime(ItemStack itemStack, @Nullable RecipeType recipeType) { - return 28800; - } -} diff --git a/src/main/java/com/drmangotea/createindustry/items/CoalCokeItem.java b/src/main/java/com/drmangotea/createindustry/items/CoalCokeItem.java deleted file mode 100644 index 848fb08a..00000000 --- a/src/main/java/com/drmangotea/createindustry/items/CoalCokeItem.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.drmangotea.createindustry.items; - -import net.minecraft.world.item.Item; -import net.minecraft.world.item.ItemStack; -import net.minecraft.world.item.crafting.RecipeType; -import org.jetbrains.annotations.Nullable; - -public class CoalCokeItem extends Item { - - public CoalCokeItem(Properties p_40566_) { - super( p_40566_); - - } - - @Override - public int getBurnTime(ItemStack itemStack, @Nullable RecipeType recipeType) { - return ; - } -} diff --git a/src/main/java/com/drmangotea/createindustry/items/FossilstoneItem.java b/src/main/java/com/drmangotea/createindustry/items/FossilstoneItem.java deleted file mode 100644 index 047bcab0..00000000 --- a/src/main/java/com/drmangotea/createindustry/items/FossilstoneItem.java +++ /dev/null @@ -1,25 +0,0 @@ -package com.drmangotea.createindustry.items; - -import net.minecraft.world.item.BlockItem; -import net.minecraft.world.item.ItemStack; -import net.minecraft.world.item.crafting.RecipeType; -import net.minecraft.world.level.block.Block; -import org.jetbrains.annotations.Nullable; - -public class FossilstoneItem extends BlockItem { - - - - - public FossilstoneItem(Block p_40565_, Properties p_40566_) { - super(p_40565_, p_40566_); - - } - - - - @Override - public int getBurnTime(ItemStack itemStack, @Nullable RecipeType recipeType) { - return 4000; - } -} diff --git a/src/main/java/com/drmangotea/createindustry/items/OilBucketItem.java b/src/main/java/com/drmangotea/createindustry/items/OilBucketItem.java deleted file mode 100644 index 15fed8c2..00000000 --- a/src/main/java/com/drmangotea/createindustry/items/OilBucketItem.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.drmangotea.createindustry.items; - -import net.minecraft.world.item.BucketItem; -import net.minecraft.world.item.ItemStack; -import net.minecraft.world.item.crafting.RecipeType; -import net.minecraft.world.level.material.Fluid; -import org.jetbrains.annotations.Nullable; - -public class OilBucketItem extends BucketItem { - public OilBucketItem(Fluid p_40689_, Properties p_40690_) { - super(p_40689_, p_40690_); - } - public OilBucketItem(java.util.function.Supplier supplier, Properties builder) { - super(supplier,builder); - } - - @Override - public int getBurnTime(ItemStack itemStack, @Nullable RecipeType recipeType) { - return 800; - } -} diff --git a/src/main/java/com/drmangotea/createindustry/items/weapons/advanced_potato_cannon/AdvancedPotatoCannonPacket.java b/src/main/java/com/drmangotea/createindustry/items/weapons/advanced_potato_cannon/AdvancedPotatoCannonPacket.java index 0794407a..bc6ca563 100644 --- a/src/main/java/com/drmangotea/createindustry/items/weapons/advanced_potato_cannon/AdvancedPotatoCannonPacket.java +++ b/src/main/java/com/drmangotea/createindustry/items/weapons/advanced_potato_cannon/AdvancedPotatoCannonPacket.java @@ -4,12 +4,12 @@ import com.drmangotea.createindustry.CreateTFMG; import com.drmangotea.createindustry.CreateTFMGClient; import com.simibubi.create.content.equipment.zapper.ShootGadgetPacket; import com.simibubi.create.content.equipment.zapper.ShootableGadgetRenderHandler; +import net.fabricmc.api.EnvType; +import net.fabricmc.api.Environment; import net.minecraft.network.FriendlyByteBuf; import net.minecraft.world.InteractionHand; import net.minecraft.world.item.ItemStack; import net.minecraft.world.phys.Vec3; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; public class AdvancedPotatoCannonPacket extends ShootGadgetPacket { @@ -46,7 +46,7 @@ public class AdvancedPotatoCannonPacket extends ShootGadgetPacket { @Override - @OnlyIn(Dist.CLIENT) + @Environment(EnvType.CLIENT) protected void handleAdditional() { CreateTFMG.LOGGER.debug("AAAAAAAAAAAAAAAAAAAAAAAAAE"); @@ -54,7 +54,7 @@ public class AdvancedPotatoCannonPacket extends ShootGadgetPacket { } @Override - @OnlyIn(Dist.CLIENT) + @Environment(EnvType.CLIENT) protected ShootableGadgetRenderHandler getHandler() { return CreateTFMGClient.ADVANCED_POTATO_CANNON_RENDER_HANDLER; } diff --git a/src/main/java/com/drmangotea/createindustry/items/weapons/advanced_potato_cannon/projectile/NapalmPotatoRenderer.java b/src/main/java/com/drmangotea/createindustry/items/weapons/advanced_potato_cannon/projectile/NapalmPotatoRenderer.java index 49c75ee2..002d1276 100644 --- a/src/main/java/com/drmangotea/createindustry/items/weapons/advanced_potato_cannon/projectile/NapalmPotatoRenderer.java +++ b/src/main/java/com/drmangotea/createindustry/items/weapons/advanced_potato_cannon/projectile/NapalmPotatoRenderer.java @@ -4,6 +4,8 @@ package com.drmangotea.createindustry.items.weapons.advanced_potato_cannon.proje import com.drmangotea.createindustry.registry.TFMGItems; import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.math.Vector3f; +import net.fabricmc.api.EnvType; +import net.fabricmc.api.Environment; import net.minecraft.client.renderer.MultiBufferSource; import net.minecraft.client.renderer.block.model.ItemTransforms; import net.minecraft.client.renderer.entity.EntityRenderer; @@ -12,10 +14,8 @@ import net.minecraft.client.renderer.entity.ItemRenderer; import net.minecraft.client.renderer.texture.OverlayTexture; import net.minecraft.client.renderer.texture.TextureAtlas; import net.minecraft.resources.ResourceLocation; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; -@OnlyIn(Dist.CLIENT) +@Environment(EnvType.CLIENT) public class NapalmPotatoRenderer extends EntityRenderer { private final ItemRenderer itemRenderer; diff --git a/src/main/java/com/drmangotea/createindustry/items/weapons/explosives/napalm/NapalmBombRenderer.java b/src/main/java/com/drmangotea/createindustry/items/weapons/explosives/napalm/NapalmBombRenderer.java index 4ea3ddd5..0a71d01f 100644 --- a/src/main/java/com/drmangotea/createindustry/items/weapons/explosives/napalm/NapalmBombRenderer.java +++ b/src/main/java/com/drmangotea/createindustry/items/weapons/explosives/napalm/NapalmBombRenderer.java @@ -3,6 +3,8 @@ package com.drmangotea.createindustry.items.weapons.explosives.napalm; import com.drmangotea.createindustry.registry.TFMGBlocks; import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.math.Vector3f; +import net.fabricmc.api.EnvType; +import net.fabricmc.api.Environment; import net.minecraft.client.renderer.MultiBufferSource; import net.minecraft.client.renderer.block.BlockRenderDispatcher; import net.minecraft.client.renderer.entity.EntityRenderer; @@ -11,10 +13,8 @@ import net.minecraft.client.renderer.entity.TntMinecartRenderer; import net.minecraft.client.renderer.texture.TextureAtlas; import net.minecraft.resources.ResourceLocation; import net.minecraft.util.Mth; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; -@OnlyIn(Dist.CLIENT) +@Environment(EnvType.CLIENT) public class NapalmBombRenderer extends EntityRenderer { private final BlockRenderDispatcher blockRenderer; public NapalmBombRenderer(EntityRendererProvider.Context p_174426_) { diff --git a/src/main/java/com/drmangotea/createindustry/items/weapons/explosives/pipe_bomb/PipeBombRenderer.java b/src/main/java/com/drmangotea/createindustry/items/weapons/explosives/pipe_bomb/PipeBombRenderer.java index 481d9cbe..86298b7e 100644 --- a/src/main/java/com/drmangotea/createindustry/items/weapons/explosives/pipe_bomb/PipeBombRenderer.java +++ b/src/main/java/com/drmangotea/createindustry/items/weapons/explosives/pipe_bomb/PipeBombRenderer.java @@ -4,6 +4,8 @@ package com.drmangotea.createindustry.items.weapons.explosives.pipe_bomb; import com.drmangotea.createindustry.registry.TFMGItems; import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.math.Vector3f; +import net.fabricmc.api.EnvType; +import net.fabricmc.api.Environment; import net.minecraft.client.renderer.MultiBufferSource; import net.minecraft.client.renderer.block.model.ItemTransforms; import net.minecraft.client.renderer.entity.EntityRenderer; @@ -12,10 +14,8 @@ import net.minecraft.client.renderer.entity.ItemRenderer; import net.minecraft.client.renderer.texture.OverlayTexture; import net.minecraft.client.renderer.texture.TextureAtlas; import net.minecraft.resources.ResourceLocation; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; -@OnlyIn(Dist.CLIENT) +@Environment(EnvType.CLIENT) public class PipeBombRenderer extends EntityRenderer { private final ItemRenderer itemRenderer; diff --git a/src/main/java/com/drmangotea/createindustry/items/weapons/explosives/thermite_grenades/ThermiteGrenadeRenderer.java b/src/main/java/com/drmangotea/createindustry/items/weapons/explosives/thermite_grenades/ThermiteGrenadeRenderer.java index c527c348..f91561f0 100644 --- a/src/main/java/com/drmangotea/createindustry/items/weapons/explosives/thermite_grenades/ThermiteGrenadeRenderer.java +++ b/src/main/java/com/drmangotea/createindustry/items/weapons/explosives/thermite_grenades/ThermiteGrenadeRenderer.java @@ -4,6 +4,8 @@ package com.drmangotea.createindustry.items.weapons.explosives.thermite_grenades import com.drmangotea.createindustry.registry.TFMGItems; import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.math.Vector3f; +import net.fabricmc.api.EnvType; +import net.fabricmc.api.Environment; import net.minecraft.client.renderer.MultiBufferSource; import net.minecraft.client.renderer.block.model.ItemTransforms; import net.minecraft.client.renderer.entity.EntityRenderer; @@ -12,10 +14,8 @@ import net.minecraft.client.renderer.entity.ItemRenderer; import net.minecraft.client.renderer.texture.OverlayTexture; import net.minecraft.client.renderer.texture.TextureAtlas; import net.minecraft.resources.ResourceLocation; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; -@OnlyIn(Dist.CLIENT) +@Environment(EnvType.CLIENT) public class ThermiteGrenadeRenderer extends EntityRenderer { private final ItemRenderer itemRenderer; private ChemicalColor chemicalColor; diff --git a/src/main/java/com/drmangotea/createindustry/items/weapons/explosives/thermite_grenades/fire/BlueFireBlock.java b/src/main/java/com/drmangotea/createindustry/items/weapons/explosives/thermite_grenades/fire/BlueFireBlock.java index a854f2ba..8f122f1e 100644 --- a/src/main/java/com/drmangotea/createindustry/items/weapons/explosives/thermite_grenades/fire/BlueFireBlock.java +++ b/src/main/java/com/drmangotea/createindustry/items/weapons/explosives/thermite_grenades/fire/BlueFireBlock.java @@ -32,9 +32,8 @@ public class BlueFireBlock extends BaseFireBlock { public static final BooleanProperty SOUTH = PipeBlock.SOUTH; public static final BooleanProperty WEST = PipeBlock.WEST; public static final BooleanProperty UP = PipeBlock.UP; - private static final Map PROPERTY_BY_DIRECTION = PipeBlock.PROPERTY_BY_DIRECTION.entrySet().stream().filter((p_53467_) -> { - return p_53467_.getKey() != Direction.DOWN; - }).collect(Util.toMap()); + private static final Map PROPERTY_BY_DIRECTION = + PipeBlock.PROPERTY_BY_DIRECTION.entrySet().stream().filter((p_53467_) -> p_53467_.getKey() != Direction.DOWN).collect(Util.toMap()); private static final VoxelShape UP_AABB = Block.box(0.0D, 15.0D, 0.0D, 16.0D, 16.0D, 16.0D); private static final VoxelShape WEST_AABB = Block.box(0.0D, 0.0D, 0.0D, 1.0D, 16.0D, 16.0D); private static final VoxelShape EAST_AABB = Block.box(15.0D, 0.0D, 0.0D, 16.0D, 16.0D, 16.0D); diff --git a/src/main/java/com/drmangotea/createindustry/items/weapons/explosives/thermite_grenades/fire/GreenFireBlock.java b/src/main/java/com/drmangotea/createindustry/items/weapons/explosives/thermite_grenades/fire/GreenFireBlock.java index 0b9da36d..bca40a52 100644 --- a/src/main/java/com/drmangotea/createindustry/items/weapons/explosives/thermite_grenades/fire/GreenFireBlock.java +++ b/src/main/java/com/drmangotea/createindustry/items/weapons/explosives/thermite_grenades/fire/GreenFireBlock.java @@ -37,9 +37,8 @@ public class GreenFireBlock extends BaseFireBlock { public static final BooleanProperty SOUTH = PipeBlock.SOUTH; public static final BooleanProperty WEST = PipeBlock.WEST; public static final BooleanProperty UP = PipeBlock.UP; - private static final Map PROPERTY_BY_DIRECTION = PipeBlock.PROPERTY_BY_DIRECTION.entrySet().stream().filter((p_53467_) -> { - return p_53467_.getKey() != Direction.DOWN; - }).collect(Util.toMap()); + private static final Map PROPERTY_BY_DIRECTION = + PipeBlock.PROPERTY_BY_DIRECTION.entrySet().stream().filter((p_53467_) -> p_53467_.getKey() != Direction.DOWN).collect(Util.toMap()); private static final VoxelShape UP_AABB = Block.box(0.0D, 15.0D, 0.0D, 16.0D, 16.0D, 16.0D); private static final VoxelShape WEST_AABB = Block.box(0.0D, 0.0D, 0.0D, 1.0D, 16.0D, 16.0D); private static final VoxelShape EAST_AABB = Block.box(15.0D, 0.0D, 0.0D, 16.0D, 16.0D, 16.0D); diff --git a/src/main/java/com/drmangotea/createindustry/items/weapons/flamethrover/FlamethrowerItem.java b/src/main/java/com/drmangotea/createindustry/items/weapons/flamethrover/FlamethrowerItem.java index c9efa807..ab5e9171 100644 --- a/src/main/java/com/drmangotea/createindustry/items/weapons/flamethrover/FlamethrowerItem.java +++ b/src/main/java/com/drmangotea/createindustry/items/weapons/flamethrover/FlamethrowerItem.java @@ -143,18 +143,18 @@ return Math.round( 13* ((float)((float)stack.getOrCreateTag().getInt("amount")/( for(FlamethrowerFuel fuel : FlamethrowerFuel.values()) { - String fluid = be.getFluid(0).getFluid().getFluidType().toString().replaceFirst("createindustry:",""); + String fluid = be.getFluid(0).getType().toString().replaceFirst("createindustry:",""); if (fluid.equals(fuel.name().toLowerCase())) { if(nbt.getString("fuel").equals(fluid)||nbt.getInt("amount")==0) { - int toDrain = Math.min(FUEL_CAPACITY - nbt.getInt("amount"), be.getFluid(0).getAmount()); + long toDrain = Math.min(FUEL_CAPACITY - nbt.getInt("amount"), be.getFluid(0).getAmount()); nbt.putString("fuel", fluid); be.getTankInventory().drain(toDrain, IFluidHandler.FluidAction.EXECUTE); - nbt.putInt("amount", nbt.getInt("amount") + toDrain); + nbt.putLong("amount", nbt.getLong("amount") + toDrain); context.getPlayer().getCooldowns().addCooldown(stack.getItem(), 20); diff --git a/src/main/java/com/drmangotea/createindustry/items/weapons/flamethrover/FlamethrowerPacket.java b/src/main/java/com/drmangotea/createindustry/items/weapons/flamethrover/FlamethrowerPacket.java index ac10b6cf..4808df17 100644 --- a/src/main/java/com/drmangotea/createindustry/items/weapons/flamethrover/FlamethrowerPacket.java +++ b/src/main/java/com/drmangotea/createindustry/items/weapons/flamethrover/FlamethrowerPacket.java @@ -3,11 +3,11 @@ package com.drmangotea.createindustry.items.weapons.flamethrover; import com.drmangotea.createindustry.CreateTFMGClient; import com.simibubi.create.content.equipment.zapper.ShootGadgetPacket; import com.simibubi.create.content.equipment.zapper.ShootableGadgetRenderHandler; +import net.fabricmc.api.EnvType; +import net.fabricmc.api.Environment; import net.minecraft.network.FriendlyByteBuf; import net.minecraft.world.InteractionHand; import net.minecraft.world.phys.Vec3; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; public class FlamethrowerPacket extends ShootGadgetPacket { @@ -31,13 +31,13 @@ public class FlamethrowerPacket extends ShootGadgetPacket { @Override - @OnlyIn(Dist.CLIENT) + @Environment(EnvType.CLIENT) protected void handleAdditional() { } @Override - @OnlyIn(Dist.CLIENT) + @Environment(EnvType.CLIENT) protected ShootableGadgetRenderHandler getHandler() { return CreateTFMGClient.FLAMETHROWER_RENDER_HANDLER; } diff --git a/src/main/java/com/drmangotea/createindustry/items/weapons/lithium_blade/LithiumBladeItem.java b/src/main/java/com/drmangotea/createindustry/items/weapons/lithium_blade/LithiumBladeItem.java index 73addc69..dc3ffbab 100644 --- a/src/main/java/com/drmangotea/createindustry/items/weapons/lithium_blade/LithiumBladeItem.java +++ b/src/main/java/com/drmangotea/createindustry/items/weapons/lithium_blade/LithiumBladeItem.java @@ -11,6 +11,7 @@ import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.SwordItem; import net.minecraft.world.item.Tier; import net.minecraft.world.item.enchantment.Enchantment; +import net.minecraft.world.item.enchantment.EnchantmentHelper; import net.minecraft.world.level.Level; import java.util.Map; @@ -29,10 +30,10 @@ public class LithiumBladeItem extends SwordItem { ItemStack stack = player.getItemInHand(hand); - ItemStack stack1 = new ItemStack(TFMGItems.LIT_LITHIUM_BLADE.get(), 1, stack.getOrCreateTag()); + ItemStack stack1 = TFMGItems.LIT_LITHIUM_BLADE.asStack(); - Map enchantments = stack.getAllEnchantments(); + Map enchantments = EnchantmentHelper.getEnchantments(stack); enchantments.forEach(stack1::enchant); diff --git a/src/main/java/com/drmangotea/createindustry/items/weapons/lithium_blade/LithiumSparkRenderer.java b/src/main/java/com/drmangotea/createindustry/items/weapons/lithium_blade/LithiumSparkRenderer.java index fd883f46..f00d7283 100644 --- a/src/main/java/com/drmangotea/createindustry/items/weapons/lithium_blade/LithiumSparkRenderer.java +++ b/src/main/java/com/drmangotea/createindustry/items/weapons/lithium_blade/LithiumSparkRenderer.java @@ -6,6 +6,8 @@ import com.mojang.blaze3d.vertex.VertexConsumer; import com.mojang.math.Matrix3f; import com.mojang.math.Matrix4f; import com.mojang.math.Vector3f; +import net.fabricmc.api.EnvType; +import net.fabricmc.api.Environment; import net.minecraft.client.renderer.MultiBufferSource; import net.minecraft.client.renderer.RenderType; import net.minecraft.client.renderer.entity.EntityRenderer; @@ -13,10 +15,8 @@ import net.minecraft.client.renderer.entity.EntityRendererProvider; import net.minecraft.client.renderer.texture.OverlayTexture; import net.minecraft.core.BlockPos; import net.minecraft.resources.ResourceLocation; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; -@OnlyIn(Dist.CLIENT) +@Environment(EnvType.CLIENT) public class LithiumSparkRenderer extends EntityRenderer { private static final ResourceLocation TEXTURE_LOCATION = CreateTFMG.asResource("textures/entity/lithium_spark.png"); private static final RenderType RENDER_TYPE = RenderType.entityCutoutNoCull(TEXTURE_LOCATION); diff --git a/src/main/java/com/drmangotea/createindustry/items/weapons/quad_potato_cannon/QuadPotatoCannonPacket.java b/src/main/java/com/drmangotea/createindustry/items/weapons/quad_potato_cannon/QuadPotatoCannonPacket.java index 24978130..cd819941 100644 --- a/src/main/java/com/drmangotea/createindustry/items/weapons/quad_potato_cannon/QuadPotatoCannonPacket.java +++ b/src/main/java/com/drmangotea/createindustry/items/weapons/quad_potato_cannon/QuadPotatoCannonPacket.java @@ -3,12 +3,12 @@ package com.drmangotea.createindustry.items.weapons.quad_potato_cannon; import com.drmangotea.createindustry.CreateTFMGClient; import com.simibubi.create.content.equipment.zapper.ShootGadgetPacket; import com.simibubi.create.content.equipment.zapper.ShootableGadgetRenderHandler; +import net.fabricmc.api.EnvType; +import net.fabricmc.api.Environment; import net.minecraft.network.FriendlyByteBuf; import net.minecraft.world.InteractionHand; import net.minecraft.world.item.ItemStack; import net.minecraft.world.phys.Vec3; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; public class QuadPotatoCannonPacket extends ShootGadgetPacket { @@ -44,13 +44,13 @@ public class QuadPotatoCannonPacket extends ShootGadgetPacket { } @Override - @OnlyIn(Dist.CLIENT) + @Environment(EnvType.CLIENT) protected void handleAdditional() { CreateTFMGClient.QUAD_POTATO_CANNON_RENDER_HANDLER.beforeShoot(pitch, location, motion, item); } @Override - @OnlyIn(Dist.CLIENT) + @Environment(EnvType.CLIENT) protected ShootableGadgetRenderHandler getHandler() { return CreateTFMGClient.QUAD_POTATO_CANNON_RENDER_HANDLER; } diff --git a/src/main/java/com/drmangotea/createindustry/mixins/FluidPropagatorMixin.java b/src/main/java/com/drmangotea/createindustry/mixins/FluidPropagatorMixin.java index 2dc0b3eb..b55b0e01 100644 --- a/src/main/java/com/drmangotea/createindustry/mixins/FluidPropagatorMixin.java +++ b/src/main/java/com/drmangotea/createindustry/mixins/FluidPropagatorMixin.java @@ -2,7 +2,6 @@ package com.drmangotea.createindustry.mixins; import com.drmangotea.createindustry.base.TFMGPipes; -import com.drmangotea.createindustry.registry.TFMGBlocks; import com.simibubi.create.AllBlocks; import com.simibubi.create.AllTags; import com.simibubi.create.content.fluids.FluidPropagator; @@ -27,9 +26,6 @@ import net.minecraft.world.level.LevelAccessor; import net.minecraft.world.level.block.entity.BlockEntity; import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.level.block.state.properties.BlockStateProperties; -import net.minecraftforge.common.util.LazyOptional; -import net.minecraftforge.fluids.capability.CapabilityFluidHandler; -import net.minecraftforge.fluids.capability.IFluidHandler; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Overwrite; import org.spongepowered.asm.mixin.Shadow; @@ -123,23 +119,13 @@ public class FluidPropagatorMixin { BlockPos connectedPos = pos.relative(side); BlockState connectedState = reader.getBlockState(connectedPos); FluidTransportBehaviour pipe = FluidPropagator.getPipe(reader, connectedPos); - if (pipe != null && pipe.canHaveFlowToward(connectedState, side.getOpposite())) - return false; - if (PumpBlock.isPump(connectedState) && connectedState.getValue(PumpBlock.FACING) - .getAxis() == side.getAxis()) - return false; - if (VanillaFluidTargets.shouldPipesConnectTo(connectedState)) - return true; - if (BlockHelper.hasBlockSolidSide(connectedState, reader, connectedPos, side.getOpposite()) - && !AllTags.AllBlockTags.FAN_TRANSPARENT.matches(connectedState)) - return false; - if (hasFluidCapability(reader, connectedPos, side.getOpposite())) - return false; - if (!(connectedState.getMaterial() - .isReplaceable() && connectedState.getDestroySpeed(reader, connectedPos) != -1) - && !connectedState.hasProperty(BlockStateProperties.WATERLOGGED)) - return false; - return true; + return (pipe == null || !pipe.canHaveFlowToward(connectedState, side.getOpposite())) + && (!PumpBlock.isPump(connectedState) || connectedState.getValue(PumpBlock.FACING).getAxis() != side.getAxis()) + && !VanillaFluidTargets.shouldPipesConnectTo(connectedState) + && (!BlockHelper.hasBlockSolidSide(connectedState, reader, connectedPos, side.getOpposite()) + || AllTags.AllBlockTags.FAN_TRANSPARENT.matches(connectedState)) + && (connectedState.getMaterial().isReplaceable() && connectedState.getDestroySpeed(reader, connectedPos) != -1 + || connectedState.hasProperty(BlockStateProperties.WATERLOGGED)); } @Shadow public static List getPipeConnections(BlockState state, FluidTransportBehaviour pipe) { @@ -153,15 +139,7 @@ public class FluidPropagatorMixin { public static int getPumpRange() { return AllConfigs.server().fluids.mechanicalPumpRange.get(); } - @Shadow - public static boolean hasFluidCapability(BlockGetter world, BlockPos pos, Direction side) { - BlockEntity tileEntity = world.getBlockEntity(pos); - if (tileEntity == null) - return false; - LazyOptional capability = - tileEntity.getCapability(CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY, side); - return capability.isPresent(); - } + @Shadow @Nullable public static Direction.Axis getStraightPipeAxis(BlockState state) { diff --git a/src/main/java/com/drmangotea/createindustry/mixins/PipeAttachmentModelMixin.java b/src/main/java/com/drmangotea/createindustry/mixins/PipeAttachmentModelMixin.java deleted file mode 100644 index 301e68f9..00000000 --- a/src/main/java/com/drmangotea/createindustry/mixins/PipeAttachmentModelMixin.java +++ /dev/null @@ -1,127 +0,0 @@ -package com.drmangotea.createindustry.mixins; - -import java.util.ArrayList; -import java.util.List; - -import com.drmangotea.createindustry.base.TFMGPipeModelData; -import com.simibubi.create.content.fluids.FluidTransportBehaviour; -import com.simibubi.create.content.fluids.PipeAttachmentModel; -import org.jetbrains.annotations.NotNull; - -import com.simibubi.create.AllPartialModels; -import com.simibubi.create.content.decoration.bracket.BracketedBlockEntityBehaviour; -import com.simibubi.create.content.fluids.FluidTransportBehaviour.AttachmentTypes; -import com.simibubi.create.content.fluids.FluidTransportBehaviour.AttachmentTypes.ComponentPartials; -import com.simibubi.create.content.fluids.pipes.FluidPipeBlock; -import com.simibubi.create.foundation.blockEntity.behaviour.BlockEntityBehaviour; -import com.simibubi.create.foundation.model.BakedModelWrapperWithData; -import com.simibubi.create.foundation.utility.Iterate; - -import net.minecraft.client.renderer.ItemBlockRenderTypes; -import net.minecraft.client.renderer.RenderType; -import net.minecraft.client.renderer.block.model.BakedQuad; -import net.minecraft.client.resources.model.BakedModel; -import net.minecraft.core.BlockPos; -import net.minecraft.core.Direction; -import net.minecraft.util.RandomSource; -import net.minecraft.world.level.BlockAndTintGetter; -import net.minecraft.world.level.block.state.BlockState; -import net.minecraftforge.client.ChunkRenderTypeSet; -import net.minecraftforge.client.model.data.ModelData; -import net.minecraftforge.client.model.data.ModelData.Builder; -import net.minecraftforge.client.model.data.ModelProperty; -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.Overwrite; - -import static net.minecraft.world.level.block.PipeBlock.PROPERTY_BY_DIRECTION; -@Mixin(PipeAttachmentModel.class) -public class PipeAttachmentModelMixin extends BakedModelWrapperWithData { - - private static final ModelProperty PIPE_PROPERTY = new ModelProperty<>(); - - public PipeAttachmentModelMixin(BakedModel template) { - super(template); - } - - /** - * @author DrMangoTea - * @reason locked pipes - */ - @Overwrite( remap = false) - protected ModelData.Builder gatherModelData(ModelData.Builder builder, BlockAndTintGetter world, BlockPos pos, BlockState state, - ModelData blockEntityData) { - TFMGPipeModelData data = new TFMGPipeModelData(); - FluidTransportBehaviour transport = BlockEntityBehaviour.get(world, pos, FluidTransportBehaviour.TYPE); - BracketedBlockEntityBehaviour bracket = BlockEntityBehaviour.get(world, pos, BracketedBlockEntityBehaviour.TYPE); - - if (transport != null) - for (Direction d : Iterate.directions) { - boolean shouldConnect = true; - if(world.getBlockState(pos.relative(d)).getBlock() instanceof FluidPipeBlock) { - - if(d.getAxis().isHorizontal()) - shouldConnect = world.getBlockState(pos.relative(d)).getValue(PROPERTY_BY_DIRECTION.get(d.getOpposite())); - - - - } - - data.putAttachment(d, transport.getRenderedRimAttachment(world, pos, state, d)); - - if(!shouldConnect) - if(state.getBlock() instanceof FluidPipeBlock) - if(state.getValue(PROPERTY_BY_DIRECTION.get(d))) - data.putAttachment(d, FluidTransportBehaviour.AttachmentTypes.RIM); - - } - if (bracket != null) - data.putBracket(bracket.getBracket()); - - data.setEncased(FluidPipeBlock.shouldDrawCasing(world, pos, state)); - return builder.with(PIPE_PROPERTY, data); - } - - @SuppressWarnings("removal") - @Override - public ChunkRenderTypeSet getRenderTypes(@NotNull BlockState state, @NotNull RandomSource rand, @NotNull ModelData data) { - ChunkRenderTypeSet set = super.getRenderTypes(state, rand, data); - if (set.isEmpty()) { - return ItemBlockRenderTypes.getRenderLayers(state); - } - return set; - } - - @Override - public List getQuads(BlockState state, Direction side, RandomSource rand, ModelData data, RenderType renderType) { - List quads = super.getQuads(state, side, rand, data, renderType); - if (data.has(PIPE_PROPERTY)) { - TFMGPipeModelData pipeData = data.get(PIPE_PROPERTY); - quads = new ArrayList<>(quads); - addQuads(quads, state, side, rand, data, pipeData, renderType); - } - return quads; - } - - private void addQuads(List quads, BlockState state, Direction side, RandomSource rand, ModelData data, - TFMGPipeModelData pipeData, RenderType renderType) { - BakedModel bracket = pipeData.getBracket(); - if (bracket != null) - quads.addAll(bracket.getQuads(state, side, rand, data, renderType)); - for (Direction d : Iterate.directions) { - AttachmentTypes type = pipeData.getAttachment(d); - for (ComponentPartials partial : type.partials) { - quads.addAll(AllPartialModels.PIPE_ATTACHMENTS.get(partial) - .get(d) - .get() - .getQuads(state, side, rand, data, renderType)); - } - } - if (pipeData.isEncased()) - quads.addAll(AllPartialModels.FLUID_PIPE_CASING.get() - .getQuads(state, side, rand, data, renderType)); - } - - - - -} diff --git a/src/main/java/com/drmangotea/createindustry/recipes/casting/CastingRecipe.java b/src/main/java/com/drmangotea/createindustry/recipes/casting/CastingRecipe.java index 9ece9c77..5c56e4f0 100644 --- a/src/main/java/com/drmangotea/createindustry/recipes/casting/CastingRecipe.java +++ b/src/main/java/com/drmangotea/createindustry/recipes/casting/CastingRecipe.java @@ -6,6 +6,7 @@ import com.simibubi.create.content.processing.recipe.ProcessingRecipeBuilder.Pro import com.simibubi.create.foundation.fluid.CombinedTankWrapper; import com.simibubi.create.foundation.fluid.FluidIngredient; import io.github.fabricators_of_create.porting_lib.transfer.item.RecipeWrapper; +import io.github.fabricators_of_create.porting_lib.util.FluidStack; import net.minecraft.world.item.ItemStack; import net.minecraft.world.level.Level; @@ -31,10 +32,10 @@ public class CastingRecipe extends ProcessingRecipe { } public boolean matches(CombinedTankWrapper inv, Level worldIn) { - if (inv.getFluidInTank(0).getAmount()==0) + if (inv.parts.get(0).iterator().next().getAmount() ==0) return false; return fluidIngredients.get(0) - .test(inv.getFluidInTank(0)); + .test(new FluidStack(inv.parts.get(0).iterator().next().getResource(), inv.parts.get(0).iterator().next().getAmount())); } public FluidIngredient getInputFluid(){ return getFluidIngredients().get(0); diff --git a/src/main/java/com/drmangotea/createindustry/recipes/jei/AdvancedDistillationCategory.java b/src/main/java/com/drmangotea/createindustry/recipes/jei/AdvancedDistillationCategory.java index 8fe69d8b..d46de724 100644 --- a/src/main/java/com/drmangotea/createindustry/recipes/jei/AdvancedDistillationCategory.java +++ b/src/main/java/com/drmangotea/createindustry/recipes/jei/AdvancedDistillationCategory.java @@ -9,7 +9,7 @@ import com.mojang.blaze3d.vertex.PoseStack; import com.simibubi.create.compat.jei.category.CreateRecipeCategory; import com.simibubi.create.foundation.fluid.FluidIngredient; import com.simibubi.create.foundation.gui.AllGuiTextures; -import mezz.jei.api.forge.ForgeTypes; +import mezz.jei.api.fabric.constants.FabricTypes; import mezz.jei.api.gui.builder.IRecipeLayoutBuilder; import mezz.jei.api.gui.ingredient.IRecipeSlotsView; import mezz.jei.api.recipe.IFocusGroup; @@ -41,7 +41,7 @@ public class AdvancedDistillationCategory extends CreateRecipeCategory p.requiresCorrectToolForDrops()) .transform(pickaxeOnly()) .blockstate(simpleCubeAll("fossilstone")) - .item(FossilstoneItem::new) - .build() + .simpleItem() .lang("Fossilstone") .register(); diff --git a/src/main/java/com/drmangotea/createindustry/registry/TFMGFuels.java b/src/main/java/com/drmangotea/createindustry/registry/TFMGFuels.java index 2f4e5e5e..09f22cd2 100644 --- a/src/main/java/com/drmangotea/createindustry/registry/TFMGFuels.java +++ b/src/main/java/com/drmangotea/createindustry/registry/TFMGFuels.java @@ -8,5 +8,7 @@ public class TFMGFuels { public void register() { registry.add(TFMGItems.COAL_COKE.get(), 3200); registry.add(TFMGItems.COAL_COKE.get(), 3200); + registry.add(TFMGBlocks.COAL_COKE_BLOCK.get().asItem(), 28800); + registry.add(TFMGBlocks.FOSSILSTONE.get().asItem(), 4000); } } diff --git a/src/main/resources/createindustry.accesswidener b/src/main/resources/createindustry.accesswidener index c90c0694..5b57ff15 100644 --- a/src/main/resources/createindustry.accesswidener +++ b/src/main/resources/createindustry.accesswidener @@ -1,3 +1,4 @@ accessWidener v1 named accessible method net/minecraft/tags/FluidTags create (Ljava/lang/String;)Lnet/minecraft/tags/TagKey; +accessible method net/minecraft/world/damagesource/DamageSource (Ljava/lang/String;)V