From e6c8effe4cfb3864427c3d3eef0e7ca53e587993 Mon Sep 17 00:00:00 2001 From: DaCodia Date: Wed, 7 Aug 2024 13:00:49 -0500 Subject: [PATCH] 50 errors and I fixed mixins and entities --- .../base/util/spark/BlueSpark.java | 15 +++-- .../base/util/spark/GreenSpark.java | 13 ++-- .../createindustry/base/util/spark/Spark.java | 13 ++-- .../projectile/NapalmPotato.java | 9 ++- .../explosives/napalm/NapalmBombEntity.java | 8 ++- .../explosives/pipe_bomb/PipeBomb.java | 8 ++- .../thermite_grenades/ThermiteGrenade.java | 9 ++- .../weapons/lithium_blade/LithiumSpark.java | 13 ++-- .../AllOreFeatureConfigEntriesMixin.java | 62 +------------------ .../mixins/ScreenEffectRendererMixin.java | 35 ----------- .../registry/TFMGEntityTypes.java | 24 ++++--- .../createindustry/registry/TFMGFluids.java | 3 +- .../resources/createindustry.accesswidener | 1 - 13 files changed, 65 insertions(+), 148 deletions(-) delete mode 100644 src/main/java/com/drmangotea/createindustry/mixins/ScreenEffectRendererMixin.java diff --git a/src/main/java/com/drmangotea/createindustry/base/util/spark/BlueSpark.java b/src/main/java/com/drmangotea/createindustry/base/util/spark/BlueSpark.java index bd933638..855ec286 100644 --- a/src/main/java/com/drmangotea/createindustry/base/util/spark/BlueSpark.java +++ b/src/main/java/com/drmangotea/createindustry/base/util/spark/BlueSpark.java @@ -1,17 +1,16 @@ package com.drmangotea.createindustry.base.util.spark; +import com.drmangotea.createindustry.items.weapons.explosives.pipe_bomb.PipeBomb; import com.drmangotea.createindustry.items.weapons.explosives.thermite_grenades.fire.BlueFireBlock; import com.drmangotea.createindustry.registry.TFMGEntityTypes; import com.drmangotea.createindustry.registry.TFMGItems; import com.simibubi.create.content.trains.CubeParticleData; +import net.fabricmc.fabric.api.object.builder.v1.entity.FabricEntityTypeBuilder; import net.minecraft.core.BlockPos; import net.minecraft.core.particles.ParticleOptions; import net.minecraft.core.particles.ParticleTypes; -import net.minecraft.world.entity.Entity; -import net.minecraft.world.entity.EntityType; -import net.minecraft.world.entity.LivingEntity; -import net.minecraft.world.entity.Mob; +import net.minecraft.world.entity.*; import net.minecraft.world.entity.projectile.ThrowableProjectile; import net.minecraft.world.item.Item; import net.minecraft.world.level.Level; @@ -79,7 +78,7 @@ public class BlueSpark extends ThrowableProjectile { super.onHitBlock(p_37384_); if (!this.level.isClientSide) { Entity entity = this.getOwner(); - if (!(entity instanceof Mob) || net.minecraftforge.event.ForgeEventFactory.getMobGriefingEvent(this.level, this)) { + if (!(entity instanceof Mob) || mobGriefingEvent(this.level, this)) { BlockPos blockpos = p_37384_.getBlockPos().relative(p_37384_.getDirection()); if (this.level.isEmptyBlock(blockpos)) { this.level.setBlockAndUpdate(blockpos, BlueFireBlock.getState(this.level, blockpos)); @@ -115,8 +114,8 @@ public class BlueSpark extends ThrowableProjectile { } @SuppressWarnings("unchecked") - public static EntityType.Builder build(EntityType.Builder builder) { - EntityType.Builder entityBuilder = (EntityType.Builder) builder; - return entityBuilder.sized(.25f, .25f); + public static FabricEntityTypeBuilder build(FabricEntityTypeBuilder builder) { + FabricEntityTypeBuilder entityBuilder = (FabricEntityTypeBuilder) builder; + return entityBuilder.dimensions(EntityDimensions.scalable(.25f, .25f)); } } \ No newline at end of file diff --git a/src/main/java/com/drmangotea/createindustry/base/util/spark/GreenSpark.java b/src/main/java/com/drmangotea/createindustry/base/util/spark/GreenSpark.java index 8fd0f4a1..97ed1011 100644 --- a/src/main/java/com/drmangotea/createindustry/base/util/spark/GreenSpark.java +++ b/src/main/java/com/drmangotea/createindustry/base/util/spark/GreenSpark.java @@ -1,17 +1,16 @@ package com.drmangotea.createindustry.base.util.spark; +import com.drmangotea.createindustry.items.weapons.explosives.pipe_bomb.PipeBomb; import com.drmangotea.createindustry.items.weapons.explosives.thermite_grenades.fire.GreenFireBlock; import com.drmangotea.createindustry.registry.TFMGEntityTypes; import com.drmangotea.createindustry.registry.TFMGItems; import com.simibubi.create.content.trains.CubeParticleData; +import net.fabricmc.fabric.api.object.builder.v1.entity.FabricEntityTypeBuilder; import net.minecraft.core.BlockPos; import net.minecraft.core.particles.ParticleOptions; import net.minecraft.core.particles.ParticleTypes; -import net.minecraft.world.entity.Entity; -import net.minecraft.world.entity.EntityType; -import net.minecraft.world.entity.LivingEntity; -import net.minecraft.world.entity.Mob; +import net.minecraft.world.entity.*; import net.minecraft.world.entity.projectile.ThrowableProjectile; import net.minecraft.world.item.Item; import net.minecraft.world.level.Level; @@ -115,8 +114,8 @@ public class GreenSpark extends ThrowableProjectile { } @SuppressWarnings("unchecked") - public static EntityType.Builder build(EntityType.Builder builder) { - EntityType.Builder entityBuilder = (EntityType.Builder) builder; - return entityBuilder.sized(.25f, .25f); + public static FabricEntityTypeBuilder build(FabricEntityTypeBuilder builder) { + FabricEntityTypeBuilder entityBuilder = (FabricEntityTypeBuilder) builder; + return entityBuilder.dimensions(EntityDimensions.scalable(.25f, .25f)); } } \ No newline at end of file diff --git a/src/main/java/com/drmangotea/createindustry/base/util/spark/Spark.java b/src/main/java/com/drmangotea/createindustry/base/util/spark/Spark.java index b912ffa8..53adff08 100644 --- a/src/main/java/com/drmangotea/createindustry/base/util/spark/Spark.java +++ b/src/main/java/com/drmangotea/createindustry/base/util/spark/Spark.java @@ -1,15 +1,14 @@ package com.drmangotea.createindustry.base.util.spark; +import com.drmangotea.createindustry.items.weapons.explosives.pipe_bomb.PipeBomb; import com.drmangotea.createindustry.registry.TFMGEntityTypes; import com.drmangotea.createindustry.registry.TFMGItems; +import net.fabricmc.fabric.api.object.builder.v1.entity.FabricEntityTypeBuilder; import net.minecraft.core.BlockPos; import net.minecraft.core.particles.ParticleOptions; import net.minecraft.core.particles.ParticleTypes; -import net.minecraft.world.entity.Entity; -import net.minecraft.world.entity.EntityType; -import net.minecraft.world.entity.LivingEntity; -import net.minecraft.world.entity.Mob; +import net.minecraft.world.entity.*; import net.minecraft.world.entity.projectile.ThrowableProjectile; import net.minecraft.world.item.Item; import net.minecraft.world.level.Level; @@ -111,8 +110,8 @@ public class Spark extends ThrowableProjectile { } @SuppressWarnings("unchecked") - public static EntityType.Builder build(EntityType.Builder builder) { - EntityType.Builder entityBuilder = (EntityType.Builder) builder; - return entityBuilder.sized(.25f, .25f); + public static FabricEntityTypeBuilder build(FabricEntityTypeBuilder builder) { + FabricEntityTypeBuilder entityBuilder = (FabricEntityTypeBuilder) builder; + return entityBuilder.dimensions(EntityDimensions.scalable(.25f, .25f)); } } \ No newline at end of file diff --git a/src/main/java/com/drmangotea/createindustry/items/weapons/advanced_potato_cannon/projectile/NapalmPotato.java b/src/main/java/com/drmangotea/createindustry/items/weapons/advanced_potato_cannon/projectile/NapalmPotato.java index c0261b65..030a34d2 100644 --- a/src/main/java/com/drmangotea/createindustry/items/weapons/advanced_potato_cannon/projectile/NapalmPotato.java +++ b/src/main/java/com/drmangotea/createindustry/items/weapons/advanced_potato_cannon/projectile/NapalmPotato.java @@ -2,13 +2,16 @@ package com.drmangotea.createindustry.items.weapons.advanced_potato_cannon.proje import com.drmangotea.createindustry.base.util.TFMGUtils; +import com.drmangotea.createindustry.items.weapons.explosives.pipe_bomb.PipeBomb; import com.drmangotea.createindustry.registry.TFMGEntityTypes; import com.drmangotea.createindustry.registry.TFMGItems; +import net.fabricmc.fabric.api.object.builder.v1.entity.FabricEntityTypeBuilder; import net.minecraft.core.BlockPos; import net.minecraft.core.particles.ParticleOptions; import net.minecraft.core.particles.ParticleTypes; import net.minecraft.world.damagesource.DamageSource; import net.minecraft.world.entity.Entity; +import net.minecraft.world.entity.EntityDimensions; import net.minecraft.world.entity.EntityType; import net.minecraft.world.entity.LivingEntity; import net.minecraft.world.entity.projectile.ThrowableItemProjectile; @@ -74,8 +77,8 @@ public class NapalmPotato extends ThrowableItemProjectile { } @SuppressWarnings("unchecked") - public static EntityType.Builder build(EntityType.Builder builder) { - EntityType.Builder entityBuilder = (EntityType.Builder) builder; - return entityBuilder.sized(.25f, .25f); + public static FabricEntityTypeBuilder build(FabricEntityTypeBuilder builder) { + FabricEntityTypeBuilder entityBuilder = (FabricEntityTypeBuilder) builder; + return entityBuilder.dimensions(EntityDimensions.scalable(.25f, .25f)); } } \ No newline at end of file diff --git a/src/main/java/com/drmangotea/createindustry/items/weapons/explosives/napalm/NapalmBombEntity.java b/src/main/java/com/drmangotea/createindustry/items/weapons/explosives/napalm/NapalmBombEntity.java index 9604d413..705dd66e 100644 --- a/src/main/java/com/drmangotea/createindustry/items/weapons/explosives/napalm/NapalmBombEntity.java +++ b/src/main/java/com/drmangotea/createindustry/items/weapons/explosives/napalm/NapalmBombEntity.java @@ -3,8 +3,10 @@ package com.drmangotea.createindustry.items.weapons.explosives.napalm; import com.drmangotea.createindustry.base.util.TFMGUtils; import com.drmangotea.createindustry.base.util.spark.Spark; +import com.drmangotea.createindustry.items.weapons.explosives.pipe_bomb.PipeBomb; import com.drmangotea.createindustry.registry.TFMGEntityTypes; import com.simibubi.create.Create; +import net.fabricmc.fabric.api.object.builder.v1.entity.FabricEntityTypeBuilder; import net.minecraft.core.BlockPos; import net.minecraft.core.particles.ParticleTypes; import net.minecraft.nbt.CompoundTag; @@ -131,8 +133,8 @@ public class NapalmBombEntity extends Entity { return new ClientboundAddEntityPacket(this); } @SuppressWarnings("unchecked") - public static EntityType.Builder build(EntityType.Builder builder) { - EntityType.Builder entityBuilder = (EntityType.Builder) builder; - return entityBuilder.sized(.25f, .25f); + public static FabricEntityTypeBuilder build(FabricEntityTypeBuilder builder) { + FabricEntityTypeBuilder entityBuilder = (FabricEntityTypeBuilder) builder; + return entityBuilder.dimensions(EntityDimensions.scalable(.25f, .25f)); } } \ No newline at end of file diff --git a/src/main/java/com/drmangotea/createindustry/items/weapons/explosives/pipe_bomb/PipeBomb.java b/src/main/java/com/drmangotea/createindustry/items/weapons/explosives/pipe_bomb/PipeBomb.java index a8e1eff9..7e7aa684 100644 --- a/src/main/java/com/drmangotea/createindustry/items/weapons/explosives/pipe_bomb/PipeBomb.java +++ b/src/main/java/com/drmangotea/createindustry/items/weapons/explosives/pipe_bomb/PipeBomb.java @@ -3,10 +3,12 @@ package com.drmangotea.createindustry.items.weapons.explosives.pipe_bomb; import com.drmangotea.createindustry.registry.TFMGEntityTypes; import com.drmangotea.createindustry.registry.TFMGItems; +import net.fabricmc.fabric.api.object.builder.v1.entity.FabricEntityTypeBuilder; import net.minecraft.core.particles.ParticleOptions; import net.minecraft.core.particles.ParticleTypes; import net.minecraft.world.damagesource.DamageSource; import net.minecraft.world.entity.Entity; +import net.minecraft.world.entity.EntityDimensions; import net.minecraft.world.entity.EntityType; import net.minecraft.world.entity.LivingEntity; import net.minecraft.world.entity.projectile.ThrowableItemProjectile; @@ -74,8 +76,8 @@ public class PipeBomb extends ThrowableItemProjectile { } @SuppressWarnings("unchecked") - public static EntityType.Builder build(EntityType.Builder builder) { - EntityType.Builder entityBuilder = (EntityType.Builder) builder; - return entityBuilder.sized(.25f, .25f); + public static FabricEntityTypeBuilder build(FabricEntityTypeBuilder builder) { + FabricEntityTypeBuilder entityBuilder = (FabricEntityTypeBuilder) builder; + return entityBuilder.dimensions(EntityDimensions.scalable(.25f, .25f)); } } \ No newline at end of file diff --git a/src/main/java/com/drmangotea/createindustry/items/weapons/explosives/thermite_grenades/ThermiteGrenade.java b/src/main/java/com/drmangotea/createindustry/items/weapons/explosives/thermite_grenades/ThermiteGrenade.java index e5bd2dec..fc23ba57 100644 --- a/src/main/java/com/drmangotea/createindustry/items/weapons/explosives/thermite_grenades/ThermiteGrenade.java +++ b/src/main/java/com/drmangotea/createindustry/items/weapons/explosives/thermite_grenades/ThermiteGrenade.java @@ -4,13 +4,16 @@ package com.drmangotea.createindustry.items.weapons.explosives.thermite_grenades import com.drmangotea.createindustry.base.util.spark.BlueSpark; import com.drmangotea.createindustry.base.util.spark.GreenSpark; import com.drmangotea.createindustry.base.util.spark.Spark; +import com.drmangotea.createindustry.items.weapons.explosives.pipe_bomb.PipeBomb; import com.drmangotea.createindustry.registry.TFMGEntityTypes; import com.drmangotea.createindustry.registry.TFMGItems; import com.simibubi.create.Create; +import net.fabricmc.fabric.api.object.builder.v1.entity.FabricEntityTypeBuilder; import net.minecraft.core.particles.ParticleOptions; import net.minecraft.core.particles.ParticleTypes; import net.minecraft.world.damagesource.DamageSource; import net.minecraft.world.entity.Entity; +import net.minecraft.world.entity.EntityDimensions; import net.minecraft.world.entity.EntityType; import net.minecraft.world.entity.LivingEntity; import net.minecraft.world.entity.projectile.ThrowableItemProjectile; @@ -111,8 +114,8 @@ public class ThermiteGrenade extends ThrowableItemProjectile { } @SuppressWarnings("unchecked") - public static EntityType.Builder build(EntityType.Builder builder) { - EntityType.Builder entityBuilder = (EntityType.Builder) builder; - return entityBuilder.sized(.25f, .25f); + public static FabricEntityTypeBuilder build(FabricEntityTypeBuilder builder) { + FabricEntityTypeBuilder entityBuilder = (FabricEntityTypeBuilder) builder; + return entityBuilder.dimensions(EntityDimensions.scalable(.25f, .25f)); } } \ No newline at end of file diff --git a/src/main/java/com/drmangotea/createindustry/items/weapons/lithium_blade/LithiumSpark.java b/src/main/java/com/drmangotea/createindustry/items/weapons/lithium_blade/LithiumSpark.java index a04a23fc..d975bc5f 100644 --- a/src/main/java/com/drmangotea/createindustry/items/weapons/lithium_blade/LithiumSpark.java +++ b/src/main/java/com/drmangotea/createindustry/items/weapons/lithium_blade/LithiumSpark.java @@ -1,20 +1,19 @@ package com.drmangotea.createindustry.items.weapons.lithium_blade; +import com.drmangotea.createindustry.items.weapons.explosives.pipe_bomb.PipeBomb; import com.drmangotea.createindustry.items.weapons.explosives.thermite_grenades.fire.BlueFireBlock; import com.drmangotea.createindustry.registry.TFMGEntityTypes; import com.drmangotea.createindustry.registry.TFMGItems; import com.drmangotea.createindustry.registry.TFMGMobEffects; import com.simibubi.create.content.trains.CubeParticleData; +import net.fabricmc.fabric.api.object.builder.v1.entity.FabricEntityTypeBuilder; import net.minecraft.core.BlockPos; import net.minecraft.core.particles.ParticleOptions; import net.minecraft.core.particles.ParticleTypes; import net.minecraft.util.Mth; import net.minecraft.world.effect.MobEffectInstance; -import net.minecraft.world.entity.Entity; -import net.minecraft.world.entity.EntityType; -import net.minecraft.world.entity.LivingEntity; -import net.minecraft.world.entity.Mob; +import net.minecraft.world.entity.*; import net.minecraft.world.entity.projectile.ThrowableProjectile; import net.minecraft.world.item.Item; import net.minecraft.world.level.Level; @@ -124,8 +123,8 @@ public class LithiumSpark extends ThrowableProjectile { } @SuppressWarnings("unchecked") - public static EntityType.Builder build(EntityType.Builder builder) { - EntityType.Builder entityBuilder = (EntityType.Builder) builder; - return entityBuilder.sized(.25f, .25f); + public static FabricEntityTypeBuilder build(FabricEntityTypeBuilder builder) { + FabricEntityTypeBuilder entityBuilder = (FabricEntityTypeBuilder) builder; + return entityBuilder.dimensions(EntityDimensions.scalable(.25f, .25f)); } } \ No newline at end of file diff --git a/src/main/java/com/drmangotea/createindustry/mixins/AllOreFeatureConfigEntriesMixin.java b/src/main/java/com/drmangotea/createindustry/mixins/AllOreFeatureConfigEntriesMixin.java index 8904f61f..00b7d98f 100644 --- a/src/main/java/com/drmangotea/createindustry/mixins/AllOreFeatureConfigEntriesMixin.java +++ b/src/main/java/com/drmangotea/createindustry/mixins/AllOreFeatureConfigEntriesMixin.java @@ -64,68 +64,8 @@ public class AllOreFeatureConfigEntriesMixin { OreFeatureConfigEntry configDrivenFeatureEntry = new OreFeatureConfigEntry(id, clusterSize, frequency, minHeight, maxHeight); return configDrivenFeatureEntry; } - @Shadow - public static void fillConfig(ForgeConfigSpec.Builder builder, String namespace) { - OreFeatureConfigEntry.ALL - .forEach((id, entry) -> { - if (id.getNamespace().equals(namespace)) { - builder.push(entry.getName()); - entry.addToConfig(builder); - builder.pop(); - } - }); - } + @Shadow public static void init() {} - @Shadow - public static void gatherData(GatherDataEvent event) { - DataGenerator generator = event.getGenerator(); - RegistryAccess registryAccess = RegistryAccess.BUILTIN.get(); - - // - - Map> configuredFeatures = new HashMap<>(); - for (Map.Entry entry : OreFeatureConfigEntry.ALL.entrySet()) { - OreFeatureConfigEntry.DatagenExtension datagenExt = entry.getValue().datagenExt(); - if (datagenExt != null) { - configuredFeatures.put(entry.getKey(), datagenExt.createConfiguredFeature(registryAccess)); - } - } - - DynamicDataProvider> configuredFeatureProvider = DynamicDataProvider.create(generator, "Create's Configured Features", registryAccess, Registry.CONFIGURED_FEATURE_REGISTRY, configuredFeatures); - if (configuredFeatureProvider != null) { - generator.addProvider(true, configuredFeatureProvider); - } - - // - - Map placedFeatures = new HashMap<>(); - for (Map.Entry entry : OreFeatureConfigEntry.ALL.entrySet()) { - OreFeatureConfigEntry.DatagenExtension datagenExt = entry.getValue().datagenExt(); - if (datagenExt != null) { - placedFeatures.put(entry.getKey(), datagenExt.createPlacedFeature(registryAccess)); - } - } - - DynamicDataProvider placedFeatureProvider = DynamicDataProvider.create(generator, "Create's Placed Features", registryAccess, Registry.PLACED_FEATURE_REGISTRY, placedFeatures); - if (placedFeatureProvider != null) { - generator.addProvider(true, placedFeatureProvider); - } - - // - - Map biomeModifiers = new HashMap<>(); - for (Map.Entry entry : OreFeatureConfigEntry.ALL.entrySet()) { - OreFeatureConfigEntry.DatagenExtension datagenExt = entry.getValue().datagenExt(); - if (datagenExt != null) { - biomeModifiers.put(entry.getKey(), datagenExt.createBiomeModifier(registryAccess)); - } - } - - DynamicDataProvider biomeModifierProvider = DynamicDataProvider.create(generator, "Create's Biome Modifiers", registryAccess, ForgeRegistries.Keys.BIOME_MODIFIERS, biomeModifiers); - if (biomeModifierProvider != null) { - generator.addProvider(true, biomeModifierProvider); - } - } } diff --git a/src/main/java/com/drmangotea/createindustry/mixins/ScreenEffectRendererMixin.java b/src/main/java/com/drmangotea/createindustry/mixins/ScreenEffectRendererMixin.java deleted file mode 100644 index d4a220cf..00000000 --- a/src/main/java/com/drmangotea/createindustry/mixins/ScreenEffectRendererMixin.java +++ /dev/null @@ -1,35 +0,0 @@ -package com.drmangotea.createindustry.mixins; - -import com.drmangotea.createindustry.CreateTFMG; -import com.drmangotea.createindustry.registry.TFMGBlocks; -import com.mojang.blaze3d.vertex.PoseStack; -import net.minecraft.client.Minecraft; -import net.minecraft.client.renderer.ScreenEffectRenderer; -import net.minecraft.resources.ResourceLocation; -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.injection.At; -import org.spongepowered.asm.mixin.injection.Inject; -import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; - -@Mixin(ScreenEffectRenderer.class) -public abstract class ScreenEffectRendererMixin { - - private static final ResourceLocation MOLTEN_METAL_OVERLAY = CreateTFMG.asResource("textures/gui/molten_metal.png"); - - @Inject(method = "renderScreenEffect", at = @At("HEAD")) - private static void renderScreenEffect(Minecraft p_110719_, PoseStack p_110720_, CallbackInfo ci) { - - if (!p_110719_.player.isSpectator()) { - if (p_110719_.player.getLevel().getBlockState(p_110719_.player.getOnPos().above(2)).is(TFMGBlocks.MOLTEN_METAL.get())) { - renderMoltenMetal(p_110719_, p_110720_); - } - } - - } - private static void renderMoltenMetal(Minecraft p_110726_, PoseStack p_110727_) { - - for(int i = 0 ; i<10; i++) - renderFluid(p_110726_, p_110727_, MOLTEN_METAL_OVERLAY); - } - -} diff --git a/src/main/java/com/drmangotea/createindustry/registry/TFMGEntityTypes.java b/src/main/java/com/drmangotea/createindustry/registry/TFMGEntityTypes.java index cf2d2cfa..ecf887d0 100644 --- a/src/main/java/com/drmangotea/createindustry/registry/TFMGEntityTypes.java +++ b/src/main/java/com/drmangotea/createindustry/registry/TFMGEntityTypes.java @@ -12,12 +12,13 @@ import com.drmangotea.createindustry.items.weapons.explosives.thermite_grenades. import com.drmangotea.createindustry.items.weapons.explosives.thermite_grenades.ThermiteGrenadeRenderer; import com.drmangotea.createindustry.items.weapons.lithium_blade.LithiumSpark; import com.drmangotea.createindustry.items.weapons.lithium_blade.LithiumSparkRenderer; -import com.simibubi.create.foundation.data.CreateEntityBuilder; import com.simibubi.create.foundation.utility.Lang; +import com.tterrag.registrate.builders.EntityBuilder; import com.tterrag.registrate.util.entry.EntityEntry; import com.tterrag.registrate.util.nullness.NonNullConsumer; import com.tterrag.registrate.util.nullness.NonNullFunction; import com.tterrag.registrate.util.nullness.NonNullSupplier; +import io.github.fabricators_of_create.porting_lib.attributes.extensions.EntityAttributes; import net.fabricmc.fabric.api.object.builder.v1.entity.FabricEntityTypeBuilder; import net.minecraft.client.renderer.entity.EntityRenderer; import net.minecraft.client.renderer.entity.EntityRendererProvider; @@ -66,16 +67,21 @@ public class TFMGEntityTypes { - private static CreateEntityBuilder register(String name, EntityType.EntityFactory factory, - NonNullSupplier>> renderer, - MobCategory group, int range, int updateFrequency, boolean sendVelocity, boolean immuneToFire, - NonNullConsumer> propertyBuilder) { + private static EntityBuilder register(String name, EntityType.EntityFactory factory, + NonNullSupplier>> renderer, + MobCategory group, + int range, int updateFrequency, boolean sendVelocity, boolean immuneToFire, + NonNullConsumer> propertyBuilder ) { String id = Lang.asId(name); - return (CreateEntityBuilder) CreateTFMG.REGISTRATE + return CreateTFMG.REGISTRATE .entity(id, factory, group) - .properties(b -> b.trackRangeBlocks(range) - .trackedUpdateRate(updateFrequency) - .forceTrackedVelocityUpdates(sendVelocity)) + .properties( + b -> b.trackRangeBlocks(range) + .trackedUpdateRate(updateFrequency) + .forceTrackedVelocityUpdates(sendVelocity) + ) .properties(propertyBuilder) .properties(b -> { if (immuneToFire) diff --git a/src/main/java/com/drmangotea/createindustry/registry/TFMGFluids.java b/src/main/java/com/drmangotea/createindustry/registry/TFMGFluids.java index a85cd480..2c1903e9 100644 --- a/src/main/java/com/drmangotea/createindustry/registry/TFMGFluids.java +++ b/src/main/java/com/drmangotea/createindustry/registry/TFMGFluids.java @@ -16,6 +16,7 @@ import com.tterrag.registrate.util.entry.FluidEntry; import net.fabricmc.fabric.api.transfer.v1.fluid.FluidConstants; import net.fabricmc.fabric.api.transfer.v1.fluid.FluidVariant; import net.fabricmc.fabric.api.transfer.v1.fluid.FluidVariantAttributeHandler; +import net.minecraft.core.Registry; import net.minecraft.network.chat.Component; import net.minecraft.resources.ResourceLocation; import net.minecraft.tags.FluidTags; @@ -246,7 +247,7 @@ public class TFMGFluids { @SafeVarargs public static FluidEntry gas(String name, TagKey... tags){ //ignore error, AW handles it - TagKey tag = FluidTags.create(CreateTFMG.asResource(name)); + TagKey tag = TagKey.create(Registry.FLUID_REGISTRY, CreateTFMG.asResource(name)); TagKey[] fluidTags = tags; diff --git a/src/main/resources/createindustry.accesswidener b/src/main/resources/createindustry.accesswidener index 5b57ff15..24c3ca52 100644 --- a/src/main/resources/createindustry.accesswidener +++ b/src/main/resources/createindustry.accesswidener @@ -1,4 +1,3 @@ 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