diff --git a/src/main/java/carpet/fakes/BiomeEffectsInterface.java b/src/main/java/carpet/fakes/BiomeEffectsInterface.java deleted file mode 100644 index c3a5acc1..00000000 --- a/src/main/java/carpet/fakes/BiomeEffectsInterface.java +++ /dev/null @@ -1,12 +0,0 @@ -package carpet.fakes; - -import java.util.Optional; - -public interface BiomeEffectsInterface -{ - int getCMFogColor(); - Optional getCMFoliageColor(); - int getCMSkyColor(); - int getCMWaterColor(); - int getCMWaterFogColor(); -} diff --git a/src/main/java/carpet/fakes/BrainInterface.java b/src/main/java/carpet/fakes/BrainInterface.java deleted file mode 100644 index b45b9778..00000000 --- a/src/main/java/carpet/fakes/BrainInterface.java +++ /dev/null @@ -1,12 +0,0 @@ -package carpet.fakes; - -import net.minecraft.entity.ai.brain.Memory; -import net.minecraft.entity.ai.brain.MemoryModuleType; - -import java.util.Map; -import java.util.Optional; - -public interface BrainInterface -{ - Map, Optional>> getMobMemories(); -} diff --git a/src/main/java/carpet/fakes/ItemEntityInterface.java b/src/main/java/carpet/fakes/ItemEntityInterface.java index 5faa1f74..4534bbfe 100644 --- a/src/main/java/carpet/fakes/ItemEntityInterface.java +++ b/src/main/java/carpet/fakes/ItemEntityInterface.java @@ -2,6 +2,5 @@ package carpet.fakes; public interface ItemEntityInterface { - int getAgeCM(); int getPickupDelayCM(); } diff --git a/src/main/java/carpet/fakes/MemoryInterface.java b/src/main/java/carpet/fakes/MemoryInterface.java deleted file mode 100644 index 8447433c..00000000 --- a/src/main/java/carpet/fakes/MemoryInterface.java +++ /dev/null @@ -1,6 +0,0 @@ -package carpet.fakes; - -public interface MemoryInterface -{ - long getScarpetExpiry(); -} diff --git a/src/main/java/carpet/mixins/BiomeEffects_scarpetMixin.java b/src/main/java/carpet/mixins/BiomeEffects_scarpetMixin.java deleted file mode 100644 index e8291304..00000000 --- a/src/main/java/carpet/mixins/BiomeEffects_scarpetMixin.java +++ /dev/null @@ -1,53 +0,0 @@ -package carpet.mixins; - -import carpet.fakes.BiomeEffectsInterface; -import net.minecraft.world.biome.BiomeEffects; -import org.spongepowered.asm.mixin.Final; -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.Shadow; - -import java.util.Optional; - -@Mixin(BiomeEffects.class) -public class BiomeEffects_scarpetMixin implements BiomeEffectsInterface -{ - @Shadow @Final private int fogColor; - - @Shadow @Final private Optional foliageColor; - - @Shadow @Final private int skyColor; - - @Shadow @Final private int waterColor; - - @Shadow @Final private int waterFogColor; - - @Override - public int getCMFogColor() - { - return fogColor; - } - - @Override - public Optional getCMFoliageColor() - { - return foliageColor; - } - - @Override - public int getCMSkyColor() - { - return skyColor; - } - - @Override - public int getCMWaterColor() - { - return waterColor; - } - - @Override - public int getCMWaterFogColor() - { - return waterFogColor; - } -} diff --git a/src/main/java/carpet/mixins/Brain_Mixin.java b/src/main/java/carpet/mixins/Brain_Mixin.java deleted file mode 100644 index 161a1e9d..00000000 --- a/src/main/java/carpet/mixins/Brain_Mixin.java +++ /dev/null @@ -1,25 +0,0 @@ -package carpet.mixins; - -import carpet.fakes.BrainInterface; -import net.minecraft.entity.ai.brain.Brain; -import net.minecraft.entity.ai.brain.Memory; -import net.minecraft.entity.ai.brain.MemoryModuleType; -import org.spongepowered.asm.mixin.Final; -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.Shadow; - -import java.util.Map; -import java.util.Optional; - -@Mixin(Brain.class) -public class Brain_Mixin implements BrainInterface -{ - - @Shadow @Final private Map, Optional>> memories; - - @Override - public Map, Optional>> getMobMemories() - { - return memories; - } -} diff --git a/src/main/java/carpet/mixins/ItemEntityMixin.java b/src/main/java/carpet/mixins/ItemEntityMixin.java index 4a58ac11..56204178 100644 --- a/src/main/java/carpet/mixins/ItemEntityMixin.java +++ b/src/main/java/carpet/mixins/ItemEntityMixin.java @@ -42,11 +42,6 @@ public abstract class ItemEntityMixin extends Entity implements ItemEntityInterf } } - @Override - public int getAgeCM() { - return this.itemAge; - } - @Override public int getPickupDelayCM() { return this.pickupDelay; @@ -105,7 +100,7 @@ public abstract class ItemEntityMixin extends Entity implements ItemEntityInterf self.setStack(selfStack); this.pickupDelay = Math.max(((ItemEntityInterface)other).getPickupDelayCM(), this.pickupDelay); - this.itemAge = Math.min(((ItemEntityInterface)other).getAgeCM(), this.itemAge); + this.itemAge = Math.min(other.getItemAge(), this.itemAge); otherStack.decrement(amount); if (otherStack.isEmpty()) diff --git a/src/main/java/carpet/mixins/Memory_scarpetMixin.java b/src/main/java/carpet/mixins/Memory_scarpetMixin.java deleted file mode 100644 index d3b4db17..00000000 --- a/src/main/java/carpet/mixins/Memory_scarpetMixin.java +++ /dev/null @@ -1,18 +0,0 @@ -package carpet.mixins; - -import carpet.fakes.MemoryInterface; -import net.minecraft.entity.ai.brain.Memory; -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.Shadow; - -@Mixin(Memory.class) -public class Memory_scarpetMixin implements MemoryInterface -{ - @Shadow private long expiry; - - @Override - public long getScarpetExpiry() - { - return expiry; - } -} diff --git a/src/main/java/carpet/mixins/VillagerEntity_aiMixin.java b/src/main/java/carpet/mixins/VillagerEntity_aiMixin.java index 37a403a7..ad8939e8 100644 --- a/src/main/java/carpet/mixins/VillagerEntity_aiMixin.java +++ b/src/main/java/carpet/mixins/VillagerEntity_aiMixin.java @@ -1,7 +1,5 @@ package carpet.mixins; -import carpet.fakes.BrainInterface; -import carpet.fakes.MemoryInterface; import carpet.helpers.ParticleDisplay; import carpet.utils.Messenger; import carpet.utils.MobAI; @@ -63,14 +61,14 @@ public abstract class VillagerEntity_aiMixin extends MerchantEntity if (MobAI.isTracking(this, MobAI.TrackingType.IRON_GOLEM_SPAWNING)) { long time; - Optional> last_seen = ((BrainInterface)this.brain).getMobMemories().get(MemoryModuleType.GOLEM_DETECTED_RECENTLY); + Optional> last_seen = this.brain.getMemories().get(MemoryModuleType.GOLEM_DETECTED_RECENTLY); if (!last_seen.isPresent()) { time = 0; } else { - time = ((MemoryInterface)last_seen.get()).getScarpetExpiry(); + time = last_seen.get().getExpiry(); } boolean recentlySeen = time > 0; Optional optional_11 = this.brain.getOptionalMemory(MemoryModuleType.LAST_SLEPT); diff --git a/src/main/java/carpet/script/utils/BiomeInfo.java b/src/main/java/carpet/script/utils/BiomeInfo.java index 13603ca2..60cc52a6 100644 --- a/src/main/java/carpet/script/utils/BiomeInfo.java +++ b/src/main/java/carpet/script/utils/BiomeInfo.java @@ -1,15 +1,12 @@ package carpet.script.utils; -import carpet.fakes.BiomeEffectsInterface; import carpet.script.value.BlockValue; import carpet.script.value.ListValue; import carpet.script.value.NumericValue; import carpet.script.value.StringValue; import carpet.script.value.Value; import carpet.script.value.ValueConversions; -import net.minecraft.client.color.world.FoliageColors; import net.minecraft.server.world.ServerWorld; -import net.minecraft.util.math.MathHelper; import net.minecraft.util.registry.Registry; import net.minecraft.world.biome.Biome; import net.minecraft.world.gen.feature.ConfiguredFeature; @@ -26,11 +23,11 @@ public class BiomeInfo put("under_material", (w, b) -> new BlockValue( b.getGenerationSettings().getSurfaceConfig().getUnderMaterial(), null, null)); put("category", (w, b) -> StringValue.of(b.getCategory().getName())); put("temperature", (w, b) -> NumericValue.of(b.getTemperature())); - put("fog_color", (w, b) -> ValueConversions.ofRGB(((BiomeEffectsInterface)b.getEffects()).getCMFogColor())); - put("foliage_color", (w, b) -> ValueConversions.ofRGB(((BiomeEffectsInterface)b.getEffects()).getCMFoliageColor().orElse(4764952))); // client Biome.getDefaultFoliageColor - put("sky_color", (w, b) -> ValueConversions.ofRGB(((BiomeEffectsInterface)b.getEffects()).getCMSkyColor())); - put("water_color", (w, b) -> ValueConversions.ofRGB(((BiomeEffectsInterface)b.getEffects()).getCMWaterColor())); - put("water_fog_color", (w, b) -> ValueConversions.ofRGB(((BiomeEffectsInterface)b.getEffects()).getCMWaterFogColor())); + put("fog_color", (w, b) -> ValueConversions.ofRGB(b.getEffects().getFogColor())); + put("foliage_color", (w, b) -> ValueConversions.ofRGB(b.getEffects().getFoliageColor().orElse(4764952))); // client Biome.getDefaultFoliageColor + put("sky_color", (w, b) -> ValueConversions.ofRGB(b.getEffects().getSkyColor())); + put("water_color", (w, b) -> ValueConversions.ofRGB(b.getEffects().getWaterColor())); + put("water_fog_color", (w, b) -> ValueConversions.ofRGB(b.getEffects().getWaterFogColor())); put("humidity", (w, b) -> NumericValue.of(b.getDownfall())); put("precipitation", (w, b) -> StringValue.of(b.getPrecipitation().getName())); put("depth", (w, b) -> NumericValue.of(b.getDepth())); diff --git a/src/main/java/carpet/script/value/EntityValue.java b/src/main/java/carpet/script/value/EntityValue.java index 19a0f670..0a6309b8 100644 --- a/src/main/java/carpet/script/value/EntityValue.java +++ b/src/main/java/carpet/script/value/EntityValue.java @@ -1,10 +1,8 @@ package carpet.script.value; -import carpet.fakes.BrainInterface; import carpet.fakes.EntityInterface; import carpet.fakes.ItemEntityInterface; import carpet.fakes.LivingEntityInterface; -import carpet.fakes.MemoryInterface; import carpet.fakes.MobEntityInterface; import carpet.fakes.ServerPlayerEntityInterface; import carpet.fakes.ServerPlayerInteractionManagerInterface; @@ -633,11 +631,11 @@ public class EntityValue extends Value if (e instanceof LivingEntity livingEntity) { Brain brain = livingEntity.getBrain(); - Map, Optional>> memories = ((BrainInterface)brain).getMobMemories(); + Map, Optional>> memories = brain.getMemories(); Optional> optmemory = memories.get(moduleType); if (optmemory==null || !optmemory.isPresent()) return Value.NULL; Memory memory = optmemory.get(); - return ValueConversions.fromTimedMemory(e, ((MemoryInterface)memory).getScarpetExpiry(), memory.getValue()); + return ValueConversions.fromTimedMemory(e, memory.getExpiry(), memory.getValue()); } return Value.NULL; }); diff --git a/src/main/resources/carpet.mixins.json b/src/main/resources/carpet.mixins.json index 10dc171a..65bf0545 100644 --- a/src/main/resources/carpet.mixins.json +++ b/src/main/resources/carpet.mixins.json @@ -66,8 +66,6 @@ "EntityTrackerEntry_leashFixMixin", "VillagerEntity_aiMixin", - "Brain_Mixin", - "Memory_scarpetMixin", "PlayerEntity_fakePlayersMixin", "ThrownEnderpearlEntity_fakePlayersMixin", @@ -189,7 +187,6 @@ "Team_scarpetMixin", "TradeOutputSlot_scarpetEventMixin", - "BiomeEffects_scarpetMixin", "ChunkTicketManager_scarpetMixin", "PointOfInterest_scarpetMixin", "ServerWorld_scarpetMixin",