Rename all accessor mixins to Accessor* so it's easy to see at a glance whether a mixin has logic or not

This commit is contained in:
Vincent Lee committed 2020-07-18 12:38:45 -05:00
1 parent 7ab67b34bf
commit 3ccca82ebf
59 files changed
+147 -157

No files matched your search

@@ -22,7 +22,7 @@ import vazkii.botania.common.core.handler.ManaNetworkHandler;
import vazkii.botania.common.core.helper.PlayerHelper;
import vazkii.botania.common.item.ItemLexicon;
import vazkii.botania.common.item.ModItems;
import vazkii.botania.mixin.MixinMinecraft;
import vazkii.botania.mixin.AccessorMinecraft;
public final class ClientTickHandler {
@@ -49,7 +49,7 @@ public final class ClientTickHandler {
if (mc.isGamePaused()) {
// If game is paused, need to use the saved value. The event is always fired with the "true" value which
// keeps updating when paused. See RenderTickEvent fire site for details, remove when MinecraftForge#6991 is resolved
partialTicks = ((MixinMinecraft) mc).getRenderPartialTicksPaused();
partialTicks = ((AccessorMinecraft) mc).getRenderPartialTicksPaused();
}
} else {
calcDelta();
@@ -23,8 +23,8 @@ import vazkii.botania.client.core.proxy.ClientProxy;
import vazkii.botania.common.block.tile.corporea.TileCorporeaIndex;
import vazkii.botania.common.network.PacketHandler;
import vazkii.botania.common.network.PacketIndexKeybindRequest;
import vazkii.botania.mixin.MixinRecipeBookGui;
import vazkii.botania.mixin.MixinRecipeBookPage;
import vazkii.botania.mixin.AccessorRecipeBookGui;
import vazkii.botania.mixin.AccessorRecipeBookPage;
import java.util.function.Predicate;
import java.util.function.Supplier;
@@ -82,8 +82,8 @@ public class CorporeaInputHandler {
if (screen instanceof InventoryScreen && ((InventoryScreen) screen).getRecipeGui().isVisible()) {
RecipeBookGui recipeBook = ((InventoryScreen) screen).getRecipeGui();
RecipeBookPage page = ((MixinRecipeBookGui) recipeBook).getRecipeBookPage();
RecipeWidget widget = ((MixinRecipeBookPage) page).getHoveredButton();
RecipeBookPage page = ((AccessorRecipeBookGui) recipeBook).getRecipeBookPage();
RecipeWidget widget = ((AccessorRecipeBookPage) page).getHoveredButton();
if (widget != null) {
return widget.getRecipe().getRecipeOutput();
}
@@ -10,7 +10,6 @@ package vazkii.botania.client.core.handler;
import net.minecraft.client.renderer.Atlases;
import net.minecraft.client.renderer.model.IBakedModel;
import net.minecraft.client.renderer.model.ItemOverride;
import net.minecraft.client.renderer.model.ModelResourceLocation;
import net.minecraft.client.renderer.model.RenderMaterial;
import net.minecraft.client.renderer.texture.AtlasTexture;
@@ -30,8 +29,8 @@ import vazkii.botania.common.Botania;
import vazkii.botania.common.item.equipment.bauble.ItemFlightTiara;
import vazkii.botania.common.item.relic.ItemKingKey;
import vazkii.botania.common.lib.LibMisc;
import vazkii.botania.mixin.MixinItemOverrideList;
import vazkii.botania.mixin.MixinModelBakery;
import vazkii.botania.mixin.AccessorItemOverrideList;
import vazkii.botania.mixin.AccessorModelBakery;
import java.util.List;
import java.util.Set;
@@ -86,7 +85,7 @@ public class MiscellaneousIcons {
public final IBakedModel[] kingKeyWeaponModels = new IBakedModel[ItemKingKey.WEAPON_TYPES];
public void onModelRegister(ModelRegistryEvent evt) {
Set<RenderMaterial> materials = MixinModelBakery.getMaterials();
Set<RenderMaterial> materials = AccessorModelBakery.getMaterials();
materials.add(RenderLexicon.TEXTURE);
materials.add(RenderLexicon.ELVEN_TEXTURE);
@@ -142,7 +141,7 @@ public class MiscellaneousIcons {
new LexiconModel(original));
// models referenced using json overrides aren't put in the model registry, so just go through all override models and wrap them there
List<IBakedModel> overrides = ((MixinItemOverrideList) original.getOverrides()).getOverrideBakedModels();
List<IBakedModel> overrides = ((AccessorItemOverrideList) original.getOverrides()).getOverrideBakedModels();
for (int i = 0; i < overrides.size(); i++) {
overrides.set(i, new LexiconModel(overrides.get(i)));
}
@@ -38,7 +38,7 @@ import vazkii.botania.common.core.handler.ConfigHandler;
import vazkii.botania.common.item.ItemLexicon;
import vazkii.botania.common.item.ModItems;
import vazkii.botania.common.lib.LibMisc;
import vazkii.botania.mixin.MixinFirstPersonRenderer;
import vazkii.botania.mixin.AccessorFirstPersonRenderer;
import java.util.ArrayList;
import java.util.List;
@@ -97,8 +97,8 @@ public class RenderLexicon {
float f10 = -0.2F * MathHelper.sin(swingProgress * (float) Math.PI);
int l = flag3 ? 1 : -1;
ms.translate((double) ((float) l * f5), (double) f6, (double) f10);
((MixinFirstPersonRenderer) Minecraft.getInstance().getFirstPersonRenderer()).callTransformSideFirstPerson(ms, handside, equipProgress);
((MixinFirstPersonRenderer) Minecraft.getInstance().getFirstPersonRenderer()).callTransformFirstPerson(ms, handside, swingProgress);
((AccessorFirstPersonRenderer) Minecraft.getInstance().getFirstPersonRenderer()).callTransformSideFirstPerson(ms, handside, equipProgress);
((AccessorFirstPersonRenderer) Minecraft.getInstance().getFirstPersonRenderer()).callTransformFirstPerson(ms, handside, swingProgress);
}
doRender(stack, handside, ms, buffers, light, partialTicks);
@@ -14,7 +14,6 @@ import net.minecraft.block.TallFlowerBlock;
import net.minecraft.client.Minecraft;
import net.minecraft.client.renderer.BufferBuilder;
import net.minecraft.client.renderer.RenderType;
import net.minecraft.client.renderer.RenderTypeBuffers;
import net.minecraft.client.renderer.RenderTypeLookup;
import net.minecraft.client.renderer.entity.PlayerRenderer;
import net.minecraft.client.settings.KeyBinding;
@@ -36,7 +35,6 @@ import net.minecraftforge.eventbus.api.EventPriority;
import net.minecraftforge.eventbus.api.IEventBus;
import net.minecraftforge.fml.DeferredWorkQueue;
import net.minecraftforge.fml.client.registry.ClientRegistry;
import net.minecraftforge.fml.common.ObfuscationReflectionHelper;
import net.minecraftforge.fml.event.lifecycle.FMLClientSetupEvent;
import net.minecraftforge.fml.event.lifecycle.FMLLoadCompleteEvent;
import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext;
@@ -74,8 +72,8 @@ import vazkii.botania.common.item.equipment.tool.terrasteel.ItemTerraPick;
import vazkii.botania.common.item.relic.ItemInfiniteFruit;
import vazkii.botania.common.item.rod.ItemTornadoRod;
import vazkii.botania.common.lib.LibMisc;
import vazkii.botania.mixin.MixinBiomeGeneratorTypeScreens;
import vazkii.botania.mixin.MixinRenderTypeBuffers;
import vazkii.botania.mixin.AccessorBiomeGeneratorTypeScreens;
import vazkii.botania.mixin.AccessorRenderTypeBuffers;
import vazkii.patchouli.api.IMultiblock;
import vazkii.patchouli.api.PatchouliAPI;
@@ -156,7 +154,7 @@ public class ClientProxy implements IProxy {
registerRenderTypes();
DeferredWorkQueue.runLater(() -> {
MixinBiomeGeneratorTypeScreens.getAllTypes().add(WorldTypeSkyblock.INSTANCE);
AccessorBiomeGeneratorTypeScreens.getAllTypes().add(WorldTypeSkyblock.INSTANCE);
CORPOREA_REQUEST = new KeyBinding("key.botania_corporea_request", KeyConflictContext.GUI, InputMappings.getInputByCode(GLFW.GLFW_KEY_C, 0), LibMisc.MOD_NAME);
ClientRegistry.registerKeyBinding(ClientProxy.CORPOREA_REQUEST);
@@ -298,7 +296,7 @@ public class ClientProxy implements IProxy {
ColorHandler.init();
// Needed to prevent mana pools on carts from X-raying through the cart
SortedMap<RenderType, BufferBuilder> layers = ((MixinRenderTypeBuffers) Minecraft.getInstance().getRenderTypeBuffers()).getFixedBuffers();
SortedMap<RenderType, BufferBuilder> layers = ((AccessorRenderTypeBuffers) Minecraft.getInstance().getRenderTypeBuffers()).getFixedBuffers();
layers.put(RenderHelper.MANA_POOL_WATER, new BufferBuilder(RenderHelper.MANA_POOL_WATER.getBufferSize()));
});
}
@@ -26,7 +26,7 @@ import net.minecraft.util.math.vector.Vector3f;
import vazkii.botania.client.core.handler.ClientTickHandler;
import vazkii.botania.common.block.tile.corporea.TileCorporeaCrystalCube;
import vazkii.botania.mixin.MixinItemEntity;
import vazkii.botania.mixin.AccessorItemEntity;
import javax.annotation.Nullable;
@@ -57,7 +57,7 @@ public class RenderTileCorporeaCrystalCube extends TileEntityRenderer<TileCorpor
};
}
((MixinItemEntity) entity).setAge(ClientTickHandler.ticksInGame);
((AccessorItemEntity) entity).setAge(ClientTickHandler.ticksInGame);
stack = cube.getRequestTarget();
entity.setItem(stack);
}
@@ -23,7 +23,7 @@ import vazkii.botania.client.core.handler.MiscellaneousIcons;
import vazkii.botania.client.core.helper.IconHelper;
import vazkii.botania.client.core.helper.RenderHelper;
import vazkii.botania.common.block.tile.TileEnchanter;
import vazkii.botania.mixin.MixinItemEntity;
import vazkii.botania.mixin.AccessorItemEntity;
import javax.annotation.Nonnull;
@@ -53,7 +53,7 @@ public class RenderTileEnchanter extends TileEntityRenderer<TileEnchanter> {
item = new ItemEntity(enchanter.getWorld(), enchanter.getPos().getX(), enchanter.getPos().getY() + 1, enchanter.getPos().getZ(), enchanter.itemToEnchant);
}
((MixinItemEntity) item).setAge(ClientTickHandler.ticksInGame);
((AccessorItemEntity) item).setAge(ClientTickHandler.ticksInGame);
item.setItem(enchanter.itemToEnchant);
ms.translate(0.5F, 1.25F, 0.5F);
@@ -32,7 +32,7 @@ import org.lwjgl.opengl.GL11;
import vazkii.botania.client.core.handler.ClientTickHandler;
import vazkii.botania.client.lib.LibResources;
import vazkii.botania.mixin.MixinWorldRenderer;
import vazkii.botania.mixin.AccessorWorldRenderer;
import java.util.Random;
@@ -55,8 +55,8 @@ public class SkyblockSkyRenderer implements SkyRenderHandler {
@Override
public void render(int ticks, float partialTicks, MatrixStack matrixStackIn, ClientWorld world, Minecraft mc) {
// Environment setup
VertexBuffer skyVBO = ((MixinWorldRenderer) mc.worldRenderer).getSkyVBO();
VertexFormat skyVertexFormat = ((MixinWorldRenderer) mc.worldRenderer).getSkyVertexFormat();
VertexBuffer skyVBO = ((AccessorWorldRenderer) mc.worldRenderer).getSkyVBO();
VertexFormat skyVertexFormat = ((AccessorWorldRenderer) mc.worldRenderer).getSkyVertexFormat();
RenderSystem.disableTexture();
Vector3d Vector3d = world.getSkyColor(mc.gameRenderer.getActiveRenderInfo().getBlockPos(), partialTicks);
@@ -378,7 +378,7 @@ public class SkyblockSkyRenderer implements SkyRenderHandler {
}
private void renderStars(VertexFormat format, MatrixStack ms, Minecraft mc, float alpha, float partialTicks) {
net.minecraft.client.renderer.vertex.VertexBuffer starVBO = ((MixinWorldRenderer) mc.worldRenderer).getStarVBO();
net.minecraft.client.renderer.vertex.VertexBuffer starVBO = ((AccessorWorldRenderer) mc.worldRenderer).getStarVBO();
float t = (ClientTickHandler.ticksInGame + partialTicks + 2000) * 0.005F;
ms.push();
@@ -23,7 +23,7 @@ import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World;
import vazkii.botania.common.lib.LibMisc;
import vazkii.botania.mixin.MixinMobEntity;
import vazkii.botania.mixin.AccessorMobEntity;
public class BlockFelPumpkin extends BlockMod {
private static final ResourceLocation LOOT_TABLE = new ResourceLocation(LibMisc.MOD_ID, "fel_blaze");
@@ -49,7 +49,7 @@ public class BlockFelPumpkin extends BlockMod {
world.setBlockState(pos.down(2), Blocks.AIR.getDefaultState());
BlazeEntity blaze = EntityType.BLAZE.create(world);
blaze.setLocationAndAngles(pos.getX() + 0.5D, pos.getY() - 1.95D, pos.getZ() + 0.5D, 0.0F, 0.0F);
((MixinMobEntity) blaze).setDeathLootTable(LOOT_TABLE);
((AccessorMobEntity) blaze).setDeathLootTable(LOOT_TABLE);
blaze.onInitialSpawn(world, world.getDifficultyForLocation(pos), SpawnReason.EVENT, null, null);
world.addEntity(blaze);
}
@@ -10,14 +10,13 @@ package vazkii.botania.common.block;
import net.minecraft.block.BlockState;
import net.minecraft.block.Blocks;
import net.minecraft.block.FireBlock;
import net.minecraft.block.VineBlock;
import net.minecraft.item.ItemStack;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.IBlockReader;
import net.minecraft.world.server.ServerWorld;
import vazkii.botania.mixin.MixinFireBlock;
import vazkii.botania.mixin.AccessorFireBlock;
import javax.annotation.Nonnull;
@@ -27,7 +26,7 @@ public class BlockSolidVines extends VineBlock {
public BlockSolidVines(Properties builder) {
super(builder);
((MixinFireBlock) Blocks.FIRE).callSetFireInfo(this, 15, 100);
((AccessorFireBlock) Blocks.FIRE).callSetFireInfo(this, 15, 100);
}
@Override
@@ -27,7 +27,7 @@ import vazkii.botania.client.fx.WispParticleData;
import vazkii.botania.common.block.ModSubtiles;
import vazkii.botania.common.network.PacketHandler;
import vazkii.botania.common.network.PacketItemAge;
import vazkii.botania.mixin.MixinItemEntity;
import vazkii.botania.mixin.AccessorItemEntity;
import java.util.List;
@@ -63,7 +63,7 @@ public class SubTileDaffomill extends TileEntityFunctionalFlower {
List<ItemEntity> items = getWorld().getEntitiesWithinAABB(ItemEntity.class, axis);
int slowdown = getSlowdownFactor();
for (ItemEntity item : items) {
if (item.isAlive() && ((MixinItemEntity) item).getAge() >= slowdown) {
if (item.isAlive() && ((AccessorItemEntity) item).getAge() >= slowdown) {
item.setMotion(
item.getMotion().getX() + orientation.getXOffset() * 0.05,
item.getMotion().getY() + orientation.getYOffset() * 0.05,
@@ -172,7 +172,7 @@ public class SubTileDaffomill extends TileEntityFunctionalFlower {
public static void onItemTrack(PlayerEvent.StartTracking evt) {
if (evt.getTarget() instanceof ItemEntity) {
int entityId = evt.getTarget().getEntityId();
int age = ((MixinItemEntity) evt.getTarget()).getAge();
int age = ((AccessorItemEntity) evt.getTarget()).getAge();
PacketHandler.sendTo((ServerPlayerEntity) evt.getPlayer(), new PacketItemAge(entityId, age));
}
}
@@ -21,7 +21,7 @@ import net.minecraft.util.math.AxisAlignedBB;
import vazkii.botania.api.subtile.RadiusDescriptor;
import vazkii.botania.api.subtile.TileEntityFunctionalFlower;
import vazkii.botania.common.block.ModSubtiles;
import vazkii.botania.mixin.MixinGoalSelector;
import vazkii.botania.mixin.AccessorGoalSelector;
import java.util.List;
@@ -72,7 +72,7 @@ public class SubTileHeiseiDream extends TileEntityFunctionalFlower {
entity.setAttackTarget(null);
// Move any EntityAIHurtByTarget to highest priority
for (PrioritizedGoal entry : ((MixinGoalSelector) entity.targetSelector).getGoals()) {
for (PrioritizedGoal entry : ((AccessorGoalSelector) entity.targetSelector).getGoals()) {
if (entry.getGoal() instanceof HurtByTargetGoal) {
// Concurrent modification OK since we break out of the loop
entity.targetSelector.removeGoal(entry.getGoal());
@@ -37,7 +37,7 @@ import vazkii.botania.api.subtile.RadiusDescriptor;
import vazkii.botania.api.subtile.TileEntityFunctionalFlower;
import vazkii.botania.common.block.ModSubtiles;
import vazkii.botania.common.core.helper.InventoryHelper;
import vazkii.botania.mixin.MixinItemEntity;
import vazkii.botania.mixin.AccessorItemEntity;
import java.util.ArrayList;
import java.util.List;
@@ -77,7 +77,7 @@ public class SubTileHopperhock extends TileEntityFunctionalFlower {
int slowdown = getSlowdownFactor();
for (ItemEntity item : items) {
int age = ((MixinItemEntity) item).getAge();
int age = ((AccessorItemEntity) item).getAge();
if (age < 60 + slowdown || age >= 105 && age < 110 || !item.isAlive() || item.getItem().isEmpty()) {
continue;
}
@@ -16,7 +16,7 @@ import net.minecraft.util.math.AxisAlignedBB;
import vazkii.botania.api.subtile.RadiusDescriptor;
import vazkii.botania.api.subtile.TileEntityFunctionalFlower;
import vazkii.botania.common.block.ModSubtiles;
import vazkii.botania.mixin.MixinItemEntity;
import vazkii.botania.mixin.AccessorItemEntity;
import java.util.List;
@@ -45,7 +45,7 @@ public class SubTilePollidisiac extends TileEntityFunctionalFlower {
if (animal.getGrowingAge() == 0 && !animal.isInLove()) {
for (ItemEntity item : items) {
int age = ((MixinItemEntity) item).getAge();
int age = ((AccessorItemEntity) item).getAge();
if (age < 60 + slowdown || !item.isAlive()) {
continue;
}
@@ -36,7 +36,7 @@ import vazkii.botania.api.subtile.RadiusDescriptor;
import vazkii.botania.api.subtile.TileEntityFunctionalFlower;
import vazkii.botania.common.block.ModSubtiles;
import vazkii.botania.common.core.handler.ConfigHandler;
import vazkii.botania.mixin.MixinItemEntity;
import vazkii.botania.mixin.AccessorItemEntity;
import javax.annotation.Nonnull;
@@ -78,7 +78,7 @@ public class SubTileRannuncarpus extends TileEntityFunctionalFlower {
int slowdown = getSlowdownFactor();
for (ItemEntity item : items) {
int age = ((MixinItemEntity) item).getAge();
int age = ((AccessorItemEntity) item).getAge();
if (age < 60 + slowdown || !item.isAlive() || item.getItem().isEmpty()) {
continue;
}
@@ -28,7 +28,7 @@ import vazkii.botania.api.subtile.TileEntityFunctionalFlower;
import vazkii.botania.common.block.ModSubtiles;
import vazkii.botania.common.network.PacketBotaniaEffect;
import vazkii.botania.common.network.PacketHandler;
import vazkii.botania.mixin.MixinItemEntity;
import vazkii.botania.mixin.AccessorItemEntity;
import java.util.List;
@@ -62,7 +62,7 @@ public class SubTileSpectranthemum extends TileEntityFunctionalFlower {
int slowdown = getSlowdownFactor();
for (ItemEntity item : items) {
int age = ((MixinItemEntity) item).getAge();
int age = ((AccessorItemEntity) item).getAge();
if (age < 60 + slowdown || !item.isAlive() || item.getPersistentData().getBoolean(TAG_TELEPORTED)) {
continue;
}
@@ -21,10 +21,10 @@ import vazkii.botania.api.subtile.RadiusDescriptor;
import vazkii.botania.api.subtile.TileEntityFunctionalFlower;
import vazkii.botania.client.fx.SparkleParticleData;
import vazkii.botania.common.block.ModSubtiles;
import vazkii.botania.mixin.MixinAvoidEntityGoal;
import vazkii.botania.mixin.MixinCreeperEntity;
import vazkii.botania.mixin.MixinGoalSelector;
import vazkii.botania.mixin.MixinNearestAttackableTarget;
import vazkii.botania.mixin.AccessorAvoidEntityGoal;
import vazkii.botania.mixin.AccessorCreeperEntity;
import vazkii.botania.mixin.AccessorGoalSelector;
import vazkii.botania.mixin.AccessorNearestAttackableTarget;
import java.util.ArrayList;
import java.util.Set;
@@ -48,24 +48,24 @@ public class SubTileTigerseye extends TileEntityFunctionalFlower {
}
for (CreeperEntity entity : getWorld().getEntitiesWithinAABB(CreeperEntity.class, new AxisAlignedBB(getEffectivePos().add(-RANGE, -RANGE_Y, -RANGE), getEffectivePos().add(RANGE + 1, RANGE_Y + 1, RANGE + 1)))) {
((MixinCreeperEntity) entity).setTimeSinceIgnited(2);
((AccessorCreeperEntity) entity).setTimeSinceIgnited(2);
entity.setAttackTarget(null);
if (getMana() >= COST) {
boolean did = false;
Set<PrioritizedGoal> goals = ((MixinGoalSelector) entity.goalSelector).getGoals();
Set<PrioritizedGoal> goals = ((AccessorGoalSelector) entity.goalSelector).getGoals();
boolean hasRunAwayFromPlayerGoal = goals.stream()
.anyMatch(g -> g.getGoal() instanceof AvoidEntityGoal && ((MixinAvoidEntityGoal) g.getGoal()).getClassToAvoid() == PlayerEntity.class);
.anyMatch(g -> g.getGoal() instanceof AvoidEntityGoal && ((AccessorAvoidEntityGoal) g.getGoal()).getClassToAvoid() == PlayerEntity.class);
if (!hasRunAwayFromPlayerGoal) {
entity.goalSelector.addGoal(3, new AvoidEntityGoal<>(entity, PlayerEntity.class, 6, 1, 1.2));
did = true;
}
for (PrioritizedGoal pg : new ArrayList<>(((MixinGoalSelector) entity.targetSelector).getGoals())) {
for (PrioritizedGoal pg : new ArrayList<>(((AccessorGoalSelector) entity.targetSelector).getGoals())) {
if (pg.getGoal() instanceof NearestAttackableTargetGoal
&& ((MixinNearestAttackableTarget) pg.getGoal()).getTargetClass() == PlayerEntity.class) {
&& ((AccessorNearestAttackableTarget) pg.getGoal()).getTargetClass() == PlayerEntity.class) {
entity.targetSelector.removeGoal(pg.getGoal());
did = true;
}
@@ -24,7 +24,7 @@ import vazkii.botania.api.subtile.TileEntityGeneratingFlower;
import vazkii.botania.common.block.ModSubtiles;
import vazkii.botania.common.block.mana.BlockSpreader;
import vazkii.botania.common.core.handler.ModSounds;
import vazkii.botania.mixin.MixinItemEntity;
import vazkii.botania.mixin.AccessorItemEntity;
public class SubTileEndoflame extends TileEntityGeneratingFlower {
private static final String TAG_BURN_TIME = "burnTime";
@@ -60,7 +60,7 @@ public class SubTileEndoflame extends TileEntityGeneratingFlower {
int slowdown = getSlowdownFactor();
for (ItemEntity item : getWorld().getEntitiesWithinAABB(ItemEntity.class, new AxisAlignedBB(getEffectivePos().add(-RANGE, -RANGE, -RANGE), getEffectivePos().add(RANGE + 1, RANGE + 1, RANGE + 1)))) {
int age = ((MixinItemEntity) item).getAge();
int age = ((AccessorItemEntity) item).getAge();
if (age >= 59 + slowdown && item.isAlive()) {
ItemStack stack = item.getItem();
if (stack.isEmpty() || stack.getItem().hasContainerItem(stack)) {
@@ -24,7 +24,7 @@ import net.minecraftforge.common.util.Constants;
import vazkii.botania.api.subtile.RadiusDescriptor;
import vazkii.botania.api.subtile.TileEntityGeneratingFlower;
import vazkii.botania.common.block.ModSubtiles;
import vazkii.botania.mixin.MixinItemEntity;
import vazkii.botania.mixin.AccessorItemEntity;
import java.util.LinkedList;
import java.util.List;
@@ -124,7 +124,7 @@ public class SubTileGourmaryllis extends TileEntityGeneratingFlower {
for (ItemEntity item : items) {
ItemStack stack = item.getItem();
int age = ((MixinItemEntity) item).getAge();
int age = ((AccessorItemEntity) item).getAge();
if (!stack.isEmpty() && stack.getItem().isFood() && item.isAlive() && age >= slowdown) {
if (cooldown <= 0) {
streakLength = Math.min(streakLength + 1, processFood(stack));
@@ -34,7 +34,7 @@ import vazkii.botania.api.subtile.RadiusDescriptor;
import vazkii.botania.api.subtile.TileEntityGeneratingFlower;
import vazkii.botania.common.block.ModSubtiles;
import vazkii.botania.common.core.helper.ColorHelper;
import vazkii.botania.mixin.MixinItemEntity;
import vazkii.botania.mixin.AccessorItemEntity;
import java.util.List;
import java.util.function.Predicate;
@@ -66,7 +66,7 @@ public class SubTileSpectrolus extends TileEntityGeneratingFlower {
AxisAlignedBB itemAABB = new AxisAlignedBB(getEffectivePos().add(-RANGE, -RANGE, -RANGE), getEffectivePos().add(RANGE + 1, RANGE + 1, RANGE + 1));
int slowdown = getSlowdownFactor();
Predicate<Entity> selector = e -> (e instanceof ItemEntity && e.isAlive() && ((MixinItemEntity) e).getAge() >= slowdown);
Predicate<Entity> selector = e -> (e instanceof ItemEntity && e.isAlive() && ((AccessorItemEntity) e).getAge() >= slowdown);
targets.addAll(getWorld().getEntitiesWithinAABB(Entity.class, itemAABB, selector));
for (Entity target : targets) {
@@ -20,7 +20,7 @@ import net.minecraft.util.math.AxisAlignedBB;
import net.minecraft.util.math.vector.Vector3d;
import net.minecraft.world.World;
import vazkii.botania.mixin.MixinItemEntity;
import vazkii.botania.mixin.AccessorItemEntity;
public class TileOpenCrate extends TileExposedSimpleInventory implements ITickableTileEntity {
public TileOpenCrate() {
@@ -73,7 +73,7 @@ public class TileOpenCrate extends TileExposedSimpleInventory implements ITickab
ItemEntity item = new ItemEntity(world, pos.getX() + 0.5, pos.getY() - 0.5, pos.getZ() + 0.5, stack);
item.setMotion(Vector3d.ZERO);
if (redstone) {
((MixinItemEntity) item).setAge(-200);
((AccessorItemEntity) item).setAge(-200);
}
getItemHandler().setInventorySlotContents(0, ItemStack.EMPTY);
@@ -21,7 +21,7 @@ import net.minecraft.world.spawner.AbstractSpawner;
import vazkii.botania.api.mana.IManaReceiver;
import vazkii.botania.client.fx.WispParticleData;
import vazkii.botania.mixin.MixinAbstractSpawner;
import vazkii.botania.mixin.AccessorAbstractSpawner;
import java.util.Optional;
@@ -40,7 +40,7 @@ public class TileSpawnerClaw extends TileMod implements IManaReceiver, ITickable
if (mana >= 5 && tileBelow instanceof MobSpawnerTileEntity) {
MobSpawnerTileEntity spawner = (MobSpawnerTileEntity) tileBelow;
AbstractSpawner logic = spawner.getSpawnerBaseLogic();
MixinAbstractSpawner mLogic = (MixinAbstractSpawner) logic;
AccessorAbstractSpawner mLogic = (AccessorAbstractSpawner) logic;
// [VanillaCopy] AbstractSpawner.tick, edits noted
// todo 1.16 investigate instead mixing into AbstractSpawner instead of duplicating logic here
@@ -24,14 +24,11 @@ import net.minecraft.util.Direction;
import net.minecraft.util.SoundCategory;
import vazkii.botania.api.internal.VanillaPacketDispatcher;
import vazkii.botania.common.Botania;
import vazkii.botania.common.block.tile.ModTiles;
import vazkii.botania.common.block.tile.TileMod;
import vazkii.botania.common.core.handler.ExoflameFurnaceHandler;
import vazkii.botania.common.core.handler.ModSounds;
import vazkii.botania.mixin.MixinAbstractFurnaceTileEntity;
import javax.annotation.Nullable;
import vazkii.botania.mixin.AccessorAbstractFurnaceTileEntity;
public class TileBellows extends TileMod implements ITickableTileEntity {
private static final String TAG_ACTIVE = "active";
@@ -82,7 +79,7 @@ public class TileBellows extends TileMod implements ITickableTileEntity {
AbstractCookingRecipe recipe = p.getFirst();
boolean canSmelt = p.getSecond();
if (canSmelt) {
MixinAbstractFurnaceTileEntity mFurnace = (MixinAbstractFurnaceTileEntity) furnace;
AccessorAbstractFurnaceTileEntity mFurnace = (AccessorAbstractFurnaceTileEntity) furnace;
mFurnace.setCookTime(Math.min(recipe.getCookTime() - 1, mFurnace.getCookTime() + 20));
mFurnace.setBurnTime(Math.max(0, mFurnace.getBurnTime() - 10));
}
@@ -20,7 +20,6 @@ import net.minecraft.entity.item.ItemEntity;
import net.minecraft.entity.player.PlayerEntity;
import net.minecraft.item.DyeColor;
import net.minecraft.item.ItemStack;
import net.minecraft.item.crafting.RecipeManager;
import net.minecraft.nbt.CompoundNBT;
import net.minecraft.tileentity.ITickableTileEntity;
import net.minecraft.tileentity.TileEntity;
@@ -56,7 +55,7 @@ import vazkii.botania.common.core.helper.Vector3;
import vazkii.botania.common.crafting.ModRecipeTypes;
import vazkii.botania.common.item.ItemManaTablet;
import vazkii.botania.common.item.ModItems;
import vazkii.botania.mixin.MixinItemEntity;
import vazkii.botania.mixin.AccessorItemEntity;
import javax.annotation.Nonnull;
@@ -176,7 +175,7 @@ public class TilePool extends TileMod implements IManaPool, IKeyLocked, ISparkAt
((IManaDissolvable) stack.getItem()).onDissolveTick(this, stack, item);
}
int age = ((MixinItemEntity) item).getAge();
int age = ((AccessorItemEntity) item).getAge();
if (age > 100 && age < 130) {
return false;
}
@@ -193,7 +192,7 @@ public class TilePool extends TileMod implements IManaPool, IKeyLocked, ISparkAt
ItemStack output = recipe.getRecipeOutput().copy();
ItemEntity outputItem = new ItemEntity(world, pos.getX() + 0.5, pos.getY() + 1.5, pos.getZ() + 0.5, output);
((MixinItemEntity) outputItem).setAge(105);
((AccessorItemEntity) outputItem).setAge(105);
world.addEntity(outputItem);
craftingFanciness();
@@ -13,7 +13,6 @@ import net.minecraft.item.crafting.IRecipe;
import net.minecraft.item.crafting.IRecipeType;
import net.minecraft.state.properties.BlockStateProperties;
import net.minecraft.tileentity.AbstractFurnaceTileEntity;
import net.minecraft.tileentity.SmokerTileEntity;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.ResourceLocation;
import net.minecraft.util.math.BlockPos;
@@ -26,7 +25,7 @@ import vazkii.botania.api.item.IExoflameHeatable;
import vazkii.botania.common.Botania;
import vazkii.botania.common.capability.SimpleCapProvider;
import vazkii.botania.common.lib.LibMisc;
import vazkii.botania.mixin.MixinAbstractFurnaceTileEntity;
import vazkii.botania.mixin.AccessorAbstractFurnaceTileEntity;
public class ExoflameFurnaceHandler {
@@ -43,11 +42,11 @@ public class ExoflameFurnaceHandler {
}
public static boolean canSmelt(AbstractFurnaceTileEntity furnace, IRecipe<?> recipe) {
return ((MixinAbstractFurnaceTileEntity) furnace).invokeCanSmelt(recipe);
return ((AccessorAbstractFurnaceTileEntity) furnace).invokeCanSmelt(recipe);
}
public static IRecipeType<? extends AbstractCookingRecipe> getRecipeType(AbstractFurnaceTileEntity furnace) {
return ((MixinAbstractFurnaceTileEntity) furnace).getRecipeType();
return ((AccessorAbstractFurnaceTileEntity) furnace).getRecipeType();
}
private static class FurnaceExoflameHeatable implements IExoflameHeatable {
@@ -85,7 +84,7 @@ public class ExoflameFurnaceHandler {
@Override
public int getBurnTime() {
return ((MixinAbstractFurnaceTileEntity) furnace).getBurnTime();
return ((AccessorAbstractFurnaceTileEntity) furnace).getBurnTime();
}
@Override
@@ -95,14 +94,14 @@ public class ExoflameFurnaceHandler {
BlockPos pos = furnace.getPos();
world.setBlockState(pos, world.getBlockState(pos).with(BlockStateProperties.LIT, true));
}
int burnTime = ((MixinAbstractFurnaceTileEntity) furnace).getBurnTime();
((MixinAbstractFurnaceTileEntity) furnace).setBurnTime(burnTime + 200);
int burnTime = ((AccessorAbstractFurnaceTileEntity) furnace).getBurnTime();
((AccessorAbstractFurnaceTileEntity) furnace).setBurnTime(burnTime + 200);
}
@Override
public void boostCookTime() {
int cookTime = ((MixinAbstractFurnaceTileEntity) furnace).getCookTime();
((MixinAbstractFurnaceTileEntity) furnace).setCookTime(Math.min(currentRecipe.getCookTime() - 1, cookTime + 1));
int cookTime = ((AccessorAbstractFurnaceTileEntity) furnace).getCookTime();
((AccessorAbstractFurnaceTileEntity) furnace).setCookTime(Math.min(currentRecipe.getCookTime() - 1, cookTime + 1));
}
}
}
@@ -20,7 +20,7 @@ import net.minecraftforge.event.RegistryEvent;
import vazkii.botania.api.recipe.*;
import vazkii.botania.common.crafting.recipe.HeadRecipe;
import vazkii.botania.mixin.MixinRecipeManager;
import vazkii.botania.mixin.AccessorRecipeManager;
import java.util.Map;
@@ -83,6 +83,6 @@ public class ModRecipeTypes {
}
public static <C extends IInventory, T extends IRecipe<C>> Map<ResourceLocation, IRecipe<C>> getRecipes(World world, IRecipeType<T> type) {
return ((MixinRecipeManager) world.getRecipeManager()).callGetRecipes(type);
return ((AccessorRecipeManager) world.getRecipeManager()).callGetRecipes(type);
}
}
@@ -20,8 +20,8 @@ import net.minecraft.util.ActionResultType;
import net.minecraft.util.Hand;
import net.minecraft.world.World;
import vazkii.botania.mixin.MixinGoalSelector;
import vazkii.botania.mixin.MixinWitherEntity;
import vazkii.botania.mixin.AccessorGoalSelector;
import vazkii.botania.mixin.AccessorWitherEntity;
import javax.annotation.Nonnull;
@@ -35,10 +35,10 @@ public class EntityPinkWither extends WitherEntity {
super.registerGoals();
// Remove firing wither skulls
((MixinGoalSelector) goalSelector).getGoals().removeIf(entry -> entry.getGoal() instanceof RangedAttackGoal);
((AccessorGoalSelector) goalSelector).getGoals().removeIf(entry -> entry.getGoal() instanceof RangedAttackGoal);
// Remove revenge and aggro
((MixinGoalSelector) targetSelector).getGoals().removeIf(entry -> entry.getGoal() instanceof HurtByTargetGoal
((AccessorGoalSelector) targetSelector).getGoals().removeIf(entry -> entry.getGoal() instanceof HurtByTargetGoal
|| entry.getGoal() instanceof NearestAttackableTargetGoal);
}
@@ -48,9 +48,9 @@ public class EntityPinkWither extends WitherEntity {
if (Math.random() < 0.1) {
for (int j = 0; j < 3; ++j) {
double x = ((MixinWitherEntity) this).callGetHeadX(j);
double y = ((MixinWitherEntity) this).callGetHeadY(j);
double z = ((MixinWitherEntity) this).callGetHeadZ(j);
double x = ((AccessorWitherEntity) this).callGetHeadX(j);
double y = ((AccessorWitherEntity) this).callGetHeadY(j);
double z = ((AccessorWitherEntity) this).callGetHeadZ(j);
world.addParticle(ParticleTypes.HEART, x + rand.nextGaussian() * 0.3, y + rand.nextGaussian() * 0.3, z + rand.nextGaussian() * 0.3, 0.0D, 0.0D, 0.0D);
}
}
@@ -23,8 +23,7 @@ import net.minecraft.util.math.*;
import net.minecraft.world.World;
import net.minecraftforge.fml.network.NetworkHooks;
import vazkii.botania.common.core.helper.Vector3;
import vazkii.botania.mixin.MixinItemEntity;
import vazkii.botania.mixin.AccessorItemEntity;
import javax.annotation.Nonnull;
@@ -38,7 +37,7 @@ public class EntityThrownItem extends ItemEntity {
public EntityThrownItem(World world, double x,
double y, double z, ItemEntity item) {
super(world, x, y, z, item.getItem());
setPickupDelay(((MixinItemEntity) item).getPickupDelay());
setPickupDelay(((AccessorItemEntity) item).getPickupDelay());
setMotion(item.getMotion());
setInvulnerable(true);
}
@@ -60,7 +59,7 @@ public class EntityThrownItem extends ItemEntity {
super.tick();
// [VanillaCopy] derivative from ThrowableEntity
int pickupDelay = ((MixinItemEntity) this).getPickupDelay();
int pickupDelay = ((AccessorItemEntity) this).getPickupDelay();
Predicate<Entity> filter = e -> !e.isSpectator() && e.isAlive() && e.canBeCollidedWith() && (!(e instanceof PlayerEntity) || pickupDelay == 0);
RayTraceResult ray = ProjectileHelper.func_234618_a_(this, filter, RayTraceContext.BlockMode.OUTLINE);
if (ray.getType() == RayTraceResult.Type.BLOCK) {
@@ -33,7 +33,7 @@ import vazkii.botania.common.block.ModBlocks;
import vazkii.botania.common.block.tile.TileCacophonium;
import vazkii.botania.common.core.handler.ModSounds;
import vazkii.botania.common.core.helper.ItemNBTHelper;
import vazkii.botania.mixin.MixinMobEntity;
import vazkii.botania.mixin.AccessorMobEntity;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
@@ -60,7 +60,7 @@ public class ItemCacophonium extends Item {
} else if (living instanceof SlimeEntity) {
sound = ((SlimeEntity) living).isSmallSlime() ? SoundEvents.ENTITY_SLIME_SQUISH_SMALL : SoundEvents.ENTITY_SLIME_SQUISH;
} else {
sound = ((MixinMobEntity) living).callGetAmbientSound();
sound = ((AccessorMobEntity) living).callGetAmbientSound();
}
if (sound != null) {
@@ -41,7 +41,7 @@ import vazkii.botania.common.core.handler.ModSounds;
import vazkii.botania.common.item.ModItems;
import vazkii.botania.common.network.PacketBotaniaEffect;
import vazkii.botania.common.network.PacketHandler;
import vazkii.botania.mixin.MixinCreeperEntity;
import vazkii.botania.mixin.AccessorCreeperEntity;
import java.util.List;
@@ -75,7 +75,7 @@ public class ItemDivaCharm extends ItemBauble implements IManaUsingItem {
target.heal(target.getMaxHealth());
target.revive();
if (target instanceof CreeperEntity) {
((MixinCreeperEntity) event.getEntityLiving()).setTimeSinceIgnited(2);
((AccessorCreeperEntity) event.getEntityLiving()).setTimeSinceIgnited(2);
}
ManaItemHandler.instance().requestManaExact(amulet, player, cost, true);
@@ -26,7 +26,7 @@ import vazkii.botania.common.core.helper.ItemNBTHelper;
import vazkii.botania.common.core.helper.MathHelper;
import vazkii.botania.common.core.helper.Vector3;
import vazkii.botania.common.lib.ModTags;
import vazkii.botania.mixin.MixinItemEntity;
import vazkii.botania.mixin.AccessorItemEntity;
import java.util.List;
@@ -103,7 +103,7 @@ public class ItemMagnetRing extends ItemBauble {
}
private boolean canPullItem(ItemEntity item) {
int pickupDelay = ((MixinItemEntity) item).getPickupDelay();
int pickupDelay = ((AccessorItemEntity) item).getPickupDelay();
if (!item.isAlive() || pickupDelay >= 40 || BotaniaAPI.instance().hasSolegnoliaAround(item) || item.getPersistentData().getBoolean("PreventRemoteMovement")) {
return false;
}
@@ -28,7 +28,7 @@ import vazkii.botania.api.item.ISortableTool;
import vazkii.botania.api.mana.IManaUsingItem;
import vazkii.botania.api.mana.ManaItemHandler;
import vazkii.botania.common.item.equipment.tool.ToolCommons;
import vazkii.botania.mixin.MixinHoeItem;
import vazkii.botania.mixin.AccessorHoeItem;
import javax.annotation.Nonnull;
@@ -88,7 +88,7 @@ public class ItemManasteelShovel extends ShovelItem implements IManaUsingItem, I
}
Block block = world.getBlockState(pos).getBlock();
BlockState converted = MixinHoeItem.getConversions().get(block);
BlockState converted = AccessorHoeItem.getConversions().get(block);
if (converted == null) {
return ActionResultType.PASS;
}
@@ -20,7 +20,7 @@ import net.minecraft.world.World;
import vazkii.botania.api.mana.IManaUsingItem;
import vazkii.botania.api.mana.ManaItemHandler;
import vazkii.botania.common.lib.LibMisc;
import vazkii.botania.mixin.MixinLivingEntity;
import vazkii.botania.mixin.AccessorLivingEntity;
import javax.annotation.Nonnull;
@@ -67,7 +67,7 @@ public class ItemInfiniteFruit extends ItemRelic implements IManaUsingItem {
if (count == 5) {
if (player.canEat(false)) {
((MixinLivingEntity) player).setActiveItemStackUseCount(20);
((AccessorLivingEntity) player).setActiveItemStackUseCount(20);
}
}
}
@@ -14,7 +14,7 @@ import net.minecraft.entity.item.ItemEntity;
import net.minecraft.network.PacketBuffer;
import net.minecraftforge.fml.network.NetworkEvent;
import vazkii.botania.mixin.MixinItemEntity;
import vazkii.botania.mixin.AccessorItemEntity;
import java.util.function.Supplier;
@@ -41,7 +41,7 @@ public class PacketItemAge {
ctx.get().enqueueWork(() -> {
Entity e = Minecraft.getInstance().world.getEntityByID(message.entityId);
if (e instanceof ItemEntity) {
((MixinItemEntity) e).setAge(message.age);
((AccessorItemEntity) e).setAge(message.age);
}
});
}
@@ -26,7 +26,7 @@ import net.minecraft.world.gen.settings.DimensionStructuresSettings;
import net.minecraft.world.server.ServerChunkProvider;
import vazkii.botania.client.lib.LibResources;
import vazkii.botania.mixin.MixinDimensionSettingsPreset;
import vazkii.botania.mixin.AccessorDimensionSettingsPreset;
import static vazkii.botania.common.lib.ResourceLocationHelper.prefix;
@@ -41,7 +41,7 @@ public class SkyblockChunkGenerator extends ChunkGenerator {
public static void init() {
Registry.register(Registry.field_239690_aB_, prefix("skyblock"), SkyblockChunkGenerator.CODEC);
dimSettingsPreset = new DimensionSettings.Preset(LibResources.PREFIX_MOD + "skyblock",
preset -> MixinDimensionSettingsPreset.createOverworldSettings(new DimensionStructuresSettings(true), false, preset));
preset -> AccessorDimensionSettingsPreset.createOverworldSettings(new DimensionStructuresSettings(true), false, preset));
}
private final long seed;
@@ -20,7 +20,7 @@ import org.spongepowered.asm.mixin.gen.Invoker;
import javax.annotation.Nullable;
@Mixin(AbstractFurnaceTileEntity.class)
public interface MixinAbstractFurnaceTileEntity {
public interface AccessorAbstractFurnaceTileEntity {
@Invoker
boolean invokeCanSmelt(@Nullable IRecipe<?> recipe);
@@ -17,7 +17,7 @@ import org.spongepowered.asm.mixin.gen.Accessor;
import org.spongepowered.asm.mixin.gen.Invoker;
@Mixin(AbstractSpawner.class)
public interface MixinAbstractSpawner {
public interface AccessorAbstractSpawner {
@Invoker("func_221409_a")
void callSpawnEntity(Entity e);
@@ -14,7 +14,7 @@ import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.gen.Accessor;
@Mixin(AvoidEntityGoal.class)
public interface MixinAvoidEntityGoal {
public interface AccessorAvoidEntityGoal {
@Accessor
Class<?> getClassToAvoid();
}
@@ -16,7 +16,7 @@ import org.spongepowered.asm.mixin.gen.Accessor;
import java.util.List;
@Mixin(BiomeGeneratorTypeScreens.class)
public interface MixinBiomeGeneratorTypeScreens {
public interface AccessorBiomeGeneratorTypeScreens {
@Accessor("field_239068_c_")
static List<BiomeGeneratorTypeScreens> getAllTypes() {
throw new IllegalStateException();
@@ -14,7 +14,7 @@ import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.gen.Accessor;
@Mixin(CreeperEntity.class)
public interface MixinCreeperEntity {
public interface AccessorCreeperEntity {
@Accessor
void setTimeSinceIgnited(int time);
}
@@ -15,7 +15,7 @@ import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.gen.Invoker;
@Mixin(DimensionSettings.Preset.class)
public interface MixinDimensionSettingsPreset {
public interface AccessorDimensionSettingsPreset {
@Invoker("func_236135_a_")
static DimensionSettings createOverworldSettings(DimensionStructuresSettings structureSettings, boolean amplified, DimensionSettings.Preset preset) {
throw new IllegalStateException();
@@ -15,7 +15,7 @@ import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.gen.Invoker;
@Mixin(FireBlock.class)
public interface MixinFireBlock {
public interface AccessorFireBlock {
@Invoker
void callSetFireInfo(Block block, int encouragement, int flammability);
}
@@ -17,7 +17,7 @@ import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.gen.Invoker;
@Mixin(FirstPersonRenderer.class)
public interface MixinFirstPersonRenderer {
public interface AccessorFirstPersonRenderer {
@Invoker
void callTransformSideFirstPerson(MatrixStack ms, HandSide side, float equip);
@@ -17,7 +17,7 @@ import org.spongepowered.asm.mixin.gen.Accessor;
import java.util.Set;
@Mixin(GoalSelector.class)
public interface MixinGoalSelector {
public interface AccessorGoalSelector {
@Accessor
Set<PrioritizedGoal> getGoals();
}
@@ -18,7 +18,7 @@ import org.spongepowered.asm.mixin.gen.Accessor;
import java.util.Map;
@Mixin(HoeItem.class)
public interface MixinHoeItem {
public interface AccessorHoeItem {
@Accessor("HOE_LOOKUP")
static Map<Block, BlockState> getConversions() {
throw new IllegalStateException();
@@ -14,7 +14,7 @@ import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.gen.Accessor;
@Mixin(ItemEntity.class)
public interface MixinItemEntity {
public interface AccessorItemEntity {
@Accessor
int getAge();
@@ -17,7 +17,7 @@ import org.spongepowered.asm.mixin.gen.Accessor;
import java.util.List;
@Mixin(ItemOverrideList.class)
public interface MixinItemOverrideList {
public interface AccessorItemOverrideList {
@Accessor
List<IBakedModel> getOverrideBakedModels();
}
@@ -14,7 +14,7 @@ import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.gen.Accessor;
@Mixin(LivingEntity.class)
public interface MixinLivingEntity {
public interface AccessorLivingEntity {
@Accessor
void setActiveItemStackUseCount(int ticks);
}
@@ -5,7 +5,7 @@ import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.gen.Accessor;
@Mixin(Minecraft.class)
public interface MixinMinecraft {
public interface AccessorMinecraft {
@Accessor
float getRenderPartialTicksPaused();
}
@@ -19,7 +19,7 @@ import org.spongepowered.asm.mixin.gen.Invoker;
import javax.annotation.Nullable;
@Mixin(MobEntity.class)
public interface MixinMobEntity {
public interface AccessorMobEntity {
@Nullable
@Invoker
SoundEvent callGetAmbientSound();
@@ -17,7 +17,7 @@ import org.spongepowered.asm.mixin.gen.Accessor;
import java.util.Set;
@Mixin(ModelBakery.class)
public interface MixinModelBakery {
public interface AccessorModelBakery {
@Accessor("LOCATIONS_BUILTIN_TEXTURES")
static Set<RenderMaterial> getMaterials() {
throw new IllegalStateException();
@@ -14,7 +14,7 @@ import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.gen.Accessor;
@Mixin(NearestAttackableTargetGoal.class)
public interface MixinNearestAttackableTarget {
public interface AccessorNearestAttackableTarget {
@Accessor
Class<?> getTargetClass();
}
@@ -15,7 +15,7 @@ import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.gen.Accessor;
@Mixin(RecipeBookGui.class)
public interface MixinRecipeBookGui {
public interface AccessorRecipeBookGui {
@Accessor
RecipeBookPage getRecipeBookPage();
}
@@ -15,7 +15,7 @@ import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.gen.Accessor;
@Mixin(RecipeBookPage.class)
public interface MixinRecipeBookPage {
public interface AccessorRecipeBookPage {
@Accessor
RecipeWidget getHoveredButton();
}
@@ -20,7 +20,7 @@ import org.spongepowered.asm.mixin.gen.Invoker;
import java.util.Map;
@Mixin(RecipeManager.class)
public interface MixinRecipeManager {
public interface AccessorRecipeManager {
@Invoker
<C extends IInventory, T extends IRecipe<C>> Map<ResourceLocation, IRecipe<C>> callGetRecipes(IRecipeType<T> type);
}
@@ -9,7 +9,7 @@ import org.spongepowered.asm.mixin.gen.Accessor;
import java.util.SortedMap;
@Mixin(RenderTypeBuffers.class)
public interface MixinRenderTypeBuffers {
public interface AccessorRenderTypeBuffers {
@Accessor
SortedMap<RenderType, BufferBuilder> getFixedBuffers();
}
@@ -5,7 +5,7 @@ import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.gen.Invoker;
@Mixin(WitherEntity.class)
public interface MixinWitherEntity {
public interface AccessorWitherEntity {
@Invoker
double callGetHeadX(int idx);
@@ -16,7 +16,7 @@ import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.gen.Accessor;
@Mixin(WorldRenderer.class)
public interface MixinWorldRenderer {
public interface AccessorWorldRenderer {
@Accessor
VertexFormat getSkyVertexFormat();
@@ -5,32 +5,32 @@
"package": "vazkii.botania.mixin",
"refmap": "botania.refmap.json",
"mixins": [
"MixinAbstractFurnaceTileEntity",
"MixinAbstractSpawner",
"MixinAvoidEntityGoal",
"MixinCreeperEntity",
"MixinDimensionSettingsPreset",
"MixinFireBlock",
"MixinGoalSelector",
"MixinHoeItem",
"MixinItemEntity",
"MixinLivingEntity",
"MixinMobEntity",
"MixinNearestAttackableTarget",
"MixinRecipeManager",
"MixinWitherEntity"
"AccessorAbstractFurnaceTileEntity",
"AccessorAbstractSpawner",
"AccessorAvoidEntityGoal",
"AccessorCreeperEntity",
"AccessorDimensionSettingsPreset",
"AccessorFireBlock",
"AccessorGoalSelector",
"AccessorHoeItem",
"AccessorItemEntity",
"AccessorLivingEntity",
"AccessorMobEntity",
"AccessorNearestAttackableTarget",
"AccessorRecipeManager",
"AccessorWitherEntity"
],
"client": [
"MixinBiomeGeneratorTypeScreens",
"MixinFirstPersonRenderer",
"MixinItemOverrideList",
"MixinModelBakery",
"MixinMinecraft",
"MixinRecipeBookGui",
"MixinRecipeBookPage",
"MixinRenderTypeBuffers",
"MixinSplashes",
"MixinWorldRenderer"
"AccessorBiomeGeneratorTypeScreens",
"AccessorFirstPersonRenderer",
"AccessorItemOverrideList",
"AccessorModelBakery",
"AccessorMinecraft",
"AccessorRecipeBookGui",
"AccessorRecipeBookPage",
"AccessorRenderTypeBuffers",
"AccessorWorldRenderer",
"MixinSplashes"
],
"injectors": {
"defaultRequire": 1