diff --git a/src/launch/java/baritone/launch/mixins/MixinEntity.java b/src/launch/java/baritone/launch/mixins/MixinEntity.java deleted file mode 100644 index a611507b8..000000000 --- a/src/launch/java/baritone/launch/mixins/MixinEntity.java +++ /dev/null @@ -1,37 +0,0 @@ -/* - * This file is part of Baritone. - * - * Baritone is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * Baritone is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with Baritone. If not, see . - */ - -package baritone.launch.mixins; - -import net.minecraft.entity.Entity; -import net.minecraft.network.datasync.EntityDataManager; -import net.minecraft.world.World; -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.Shadow; - -/** - * @author Brady - */ -@Mixin(Entity.class) -public abstract class MixinEntity { - - @Shadow - public World world; - - @Shadow - protected EntityDataManager dataManager; -} diff --git a/src/launch/java/baritone/launch/mixins/MixinEntityFireworkRocket.java b/src/launch/java/baritone/launch/mixins/MixinEntityFireworkRocket.java index 559ae0d54..f6c6fbd3e 100644 --- a/src/launch/java/baritone/launch/mixins/MixinEntityFireworkRocket.java +++ b/src/launch/java/baritone/launch/mixins/MixinEntityFireworkRocket.java @@ -22,12 +22,13 @@ import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.item.EntityFireworkRocket; import net.minecraft.network.datasync.DataParameter; +import net.minecraft.world.World; import org.spongepowered.asm.mixin.Final; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Shadow; @Mixin(EntityFireworkRocket.class) -public abstract class MixinEntityFireworkRocket extends MixinEntity implements IEntityFireworkRocket { +public abstract class MixinEntityFireworkRocket extends Entity implements IEntityFireworkRocket { @Shadow @Final @@ -39,6 +40,10 @@ public abstract class MixinEntityFireworkRocket extends MixinEntity implements I @Shadow public abstract boolean isAttachedToEntity(); + private MixinEntityFireworkRocket(World worldIn) { + super(worldIn); + } + @Override public EntityLivingBase getBoostedEntity() { if (this.isAttachedToEntity() && this.boostedEntity == null) { diff --git a/src/launch/java/baritone/launch/mixins/MixinEntityLivingBase.java b/src/launch/java/baritone/launch/mixins/MixinEntityLivingBase.java index 92f065184..df1163ea8 100644 --- a/src/launch/java/baritone/launch/mixins/MixinEntityLivingBase.java +++ b/src/launch/java/baritone/launch/mixins/MixinEntityLivingBase.java @@ -51,7 +51,7 @@ public abstract class MixinEntityLivingBase extends Entity { @Unique private RotationMoveEvent elytraRotationEvent; - public MixinEntityLivingBase(World worldIn) { + private MixinEntityLivingBase(World worldIn) { super(worldIn); } diff --git a/src/launch/resources/mixins.baritone.json b/src/launch/resources/mixins.baritone.json index cbade3329..5c221de58 100644 --- a/src/launch/resources/mixins.baritone.json +++ b/src/launch/resources/mixins.baritone.json @@ -16,7 +16,6 @@ "MixinChunkProviderServer", "MixinChunkRenderContainer", "MixinChunkRenderWorker", - "MixinEntity", "MixinEntityFireworkRocket", "MixinEntityLivingBase", "MixinEntityPlayerSP",