Clean up access transformer

This commit is contained in:
PepperBell 2021-11-11 23:15:42 -08:00
parent 795ef07b38
commit 0298d4cdf7
11 changed files with 43 additions and 102 deletions

View file

@ -313,7 +313,7 @@ public class ContraptionCollider {
boolean canWalk = bounce != 0 || slide == 0; boolean canWalk = bounce != 0 || slide == 0;
if (canWalk || !rotation.hasVerticalRotation()) { if (canWalk || !rotation.hasVerticalRotation()) {
if (canWalk) if (canWalk)
entity.onGround = true; entity.setOnGround(true);
if (entity instanceof ItemEntity) if (entity instanceof ItemEntity)
entityMotion = entityMotion.multiply(.5f, 1, .5f); entityMotion = entityMotion.multiply(.5f, 1, .5f);
} }
@ -413,7 +413,7 @@ public class ContraptionCollider {
boolean flag = p_20273_.x != vec3.x; boolean flag = p_20273_.x != vec3.x;
boolean flag1 = p_20273_.y != vec3.y; boolean flag1 = p_20273_.y != vec3.y;
boolean flag2 = p_20273_.z != vec3.z; boolean flag2 = p_20273_.z != vec3.z;
boolean flag3 = e.onGround || flag1 && p_20273_.y < 0.0D; boolean flag3 = e.isOnGround() || flag1 && p_20273_.y < 0.0D;
if (e.maxUpStep > 0.0F && flag3 && (flag || flag2)) { if (e.maxUpStep > 0.0F && flag3 && (flag || flag2)) {
Vec3 vec31 = collideBoundingBoxHeuristically(e, new Vec3(p_20273_.x, e.maxUpStep, p_20273_.z), aabb, Vec3 vec31 = collideBoundingBoxHeuristically(e, new Vec3(p_20273_.x, e.maxUpStep, p_20273_.z), aabb,
e.level, collisioncontext, rewindablestream); e.level, collisioncontext, rewindablestream);

View file

@ -177,7 +177,7 @@ public class BeltMovementHandler {
entityIn.move(SELF, movement); entityIn.move(SELF, movement);
} }
entityIn.onGround = true; entityIn.setOnGround(true);
if (!isPlayer) if (!isPlayer)
entityIn.maxUpStep = step; entityIn.maxUpStep = step;

View file

@ -28,11 +28,11 @@ public class DivingBootsItem extends CopperArmorItem {
Vec3 motion = entity.getDeltaMovement(); Vec3 motion = entity.getDeltaMovement();
Boolean isJumping = ObfuscationReflectionHelper.getPrivateValue(LivingEntity.class, entity, "f_20899_"); // jumping Boolean isJumping = ObfuscationReflectionHelper.getPrivateValue(LivingEntity.class, entity, "f_20899_"); // jumping
entity.onGround |= entity.verticalCollision; entity.setOnGround(entity.isOnGround() || entity.verticalCollision);
if (isJumping && entity.onGround) { if (isJumping && entity.isOnGround()) {
motion = motion.add(0, .5f, 0); motion = motion.add(0, .5f, 0);
entity.onGround = false; entity.setOnGround(false);
} else { } else {
motion = motion.add(0, -0.05f, 0); motion = motion.add(0, -0.05f, 0);
} }

View file

@ -101,17 +101,9 @@ public class BlueprintRenderer extends EntityRenderer<BlueprintEntity> {
squashedMS.scale(.625f, .625f, 1); squashedMS.scale(.625f, .625f, 1);
} }
Matrix3f n = squashedMS.last() squashedMS.last()
.normal(); .normal()
n.m00 = copy.m00; .load(copy);
n.m01 = copy.m01;
n.m02 = copy.m02;
n.m10 = copy.m10;
n.m11 = copy.m11;
n.m12 = copy.m12;
n.m20 = copy.m20;
n.m21 = copy.m21;
n.m22 = copy.m22;
Minecraft.getInstance() Minecraft.getInstance()
.getItemRenderer() .getItemRenderer()

View file

@ -96,8 +96,8 @@ public class EjectorBlock extends HorizontalKineticBlock implements ITE<EjectorT
if (ejectorTileEntity.launcher.getHorizontalDistance() == 0) if (ejectorTileEntity.launcher.getHorizontalDistance() == 0)
return; return;
if (entityIn.onGround) { if (entityIn.isOnGround()) {
entityIn.onGround = false; entityIn.setOnGround(false);
Vec3 center = VecHelper.getCenterOf(position) Vec3 center = VecHelper.getCenterOf(position)
.add(0, 7 / 16f, 0); .add(0, 7 / 16f, 0);
Vec3 positionVec = entityIn.position(); Vec3 positionVec = entityIn.position();

View file

@ -149,7 +149,7 @@ public class EjectorTileEntity extends KineticTileEntity {
if (entity instanceof ItemEntity) if (entity instanceof ItemEntity)
continue; continue;
entity.onGround = false; entity.setOnGround(false);
if (isPlayerEntity != level.isClientSide) if (isPlayerEntity != level.isClientSide)
continue; continue;

View file

@ -45,8 +45,8 @@ import net.minecraftforge.event.entity.living.LivingEvent.LivingUpdateEvent;
import net.minecraftforge.event.entity.player.AttackEntityEvent; import net.minecraftforge.event.entity.player.AttackEntityEvent;
import net.minecraftforge.event.entity.player.PlayerEvent; import net.minecraftforge.event.entity.player.PlayerEvent;
import net.minecraftforge.event.entity.player.PlayerEvent.PlayerLoggedInEvent; import net.minecraftforge.event.entity.player.PlayerEvent.PlayerLoggedInEvent;
import net.minecraftforge.event.world.BlockEvent.FluidPlaceBlockEvent;
import net.minecraftforge.event.world.BiomeLoadingEvent; import net.minecraftforge.event.world.BiomeLoadingEvent;
import net.minecraftforge.event.world.BlockEvent.FluidPlaceBlockEvent;
import net.minecraftforge.event.world.ChunkEvent; import net.minecraftforge.event.world.ChunkEvent;
import net.minecraftforge.event.world.WorldEvent; import net.minecraftforge.event.world.WorldEvent;
import net.minecraftforge.eventbus.api.EventPriority; import net.minecraftforge.eventbus.api.EventPriority;

View file

@ -3,10 +3,10 @@ package com.simibubi.create.foundation.ponder.content;
import com.simibubi.create.AllBlocks; import com.simibubi.create.AllBlocks;
import com.simibubi.create.content.contraptions.components.structureMovement.chassis.StickerBlock; import com.simibubi.create.content.contraptions.components.structureMovement.chassis.StickerBlock;
import com.simibubi.create.content.contraptions.components.structureMovement.chassis.StickerTileEntity; import com.simibubi.create.content.contraptions.components.structureMovement.chassis.StickerTileEntity;
import com.simibubi.create.content.logistics.block.diodes.PulseRepeaterTileEntity;
import com.simibubi.create.content.logistics.block.diodes.PulseExtenderTileEntity;
import com.simibubi.create.content.logistics.block.diodes.BrassDiodeBlock; import com.simibubi.create.content.logistics.block.diodes.BrassDiodeBlock;
import com.simibubi.create.content.logistics.block.diodes.PoweredLatchBlock; import com.simibubi.create.content.logistics.block.diodes.PoweredLatchBlock;
import com.simibubi.create.content.logistics.block.diodes.PulseExtenderTileEntity;
import com.simibubi.create.content.logistics.block.diodes.PulseRepeaterTileEntity;
import com.simibubi.create.content.logistics.block.diodes.ToggleLatchBlock; import com.simibubi.create.content.logistics.block.diodes.ToggleLatchBlock;
import com.simibubi.create.content.logistics.block.redstone.AnalogLeverTileEntity; import com.simibubi.create.content.logistics.block.redstone.AnalogLeverTileEntity;
import com.simibubi.create.content.logistics.block.redstone.NixieTubeBlock; import com.simibubi.create.content.logistics.block.redstone.NixieTubeBlock;

View file

@ -54,7 +54,7 @@ public class MinecartElement extends AnimatedSceneElement {
entity = constructor.create(scene.getWorld(), 0, 0, 0); entity = constructor.create(scene.getWorld(), 0, 0, 0);
entity.tickCount++; entity.tickCount++;
entity.onGround = true; entity.setOnGround(true);
entity.xo = entity.getX(); entity.xo = entity.getX();
entity.yo = entity.getY(); entity.yo = entity.getY();
entity.zo = entity.getZ(); entity.zo = entity.getZ();

View file

@ -66,7 +66,7 @@ public class ParrotElement extends AnimatedSceneElement {
entity.yHeadRotO = entity.yHeadRot; entity.yHeadRotO = entity.yHeadRot;
entity.oFlapSpeed = entity.flapSpeed; entity.oFlapSpeed = entity.flapSpeed;
entity.oFlap = entity.flap; entity.oFlap = entity.flap;
entity.onGround = true; entity.setOnGround(true);
entity.xo = entity.getX(); entity.xo = entity.getX();
entity.yo = entity.getY(); entity.yo = entity.getY();
@ -174,7 +174,7 @@ public class ParrotElement extends AnimatedSceneElement {
double length = entity.position() double length = entity.position()
.subtract(entity.xOld, entity.yOld, entity.zOld) .subtract(entity.xOld, entity.yOld, entity.zOld)
.length(); .length();
entity.onGround = false; entity.setOnGround(false);
double phase = Math.min(length * 15, 8); double phase = Math.min(length * 15, 8);
float f = (float) ((PonderUI.ponderTicks % 100) * phase); float f = (float) ((PonderUI.ponderTicks % 100) * phase);
entity.flapSpeed = Mth.sin(f) + 1; entity.flapSpeed = Mth.sin(f) + 1;

View file

@ -1,96 +1,45 @@
public net.minecraft.server.network.ServerGamePacketListenerImpl f_9737_ # floatingTickCount public net.minecraft.server.network.ServerGamePacketListenerImpl f_9737_ # aboveGroundTickCount
public net.minecraft.client.multiplayer.ClientPacketListener f_104897_ # viewDistance public net.minecraft.client.multiplayer.ClientPacketListener f_104897_ # serverChunkRadius
# CubeParticle # For CubeParticle
protected net.minecraft.client.particle.Particle f_107205_ # collidedY protected net.minecraft.client.particle.Particle f_107205_ # stoppedByCollision
# Needed for ChunkUtil, maybe remove these for releases # Needed for ChunkUtil, maybe remove these for releases
# ChunkManager # ChunkMap
public net.minecraft.server.level.ChunkMap m_140181_(JLnet/minecraft/server/level/ChunkHolder;)V #scheduleSave public net.minecraft.server.level.ChunkMap f_140129_ # updatingChunkMap
public net.minecraft.server.level.ChunkMap f_140129_ #loadedChunks public net.minecraft.server.level.ChunkMap f_140140_ # modified
public net.minecraft.server.level.ChunkMap f_140140_ #immutableLoadedChunksDirty public net.minecraft.server.level.ChunkMap f_140131_ # pendingUnloads
public net.minecraft.server.level.ChunkMap f_140131_ #chunksToUnload public net.minecraft.server.level.ChunkMap m_140181_(JLnet/minecraft/server/level/ChunkHolder;)V # scheduleUnload
# ChunkStatus # ChunkStatus
public-f net.minecraft.world.level.chunk.ChunkStatus f_62326_ #FULL public-f net.minecraft.world.level.chunk.ChunkStatus f_62326_ # FULL
public net.minecraft.world.level.chunk.ChunkStatus$GenerationTask public net.minecraft.world.level.chunk.ChunkStatus$GenerationTask
public net.minecraft.world.level.chunk.ChunkStatus$LoadingTask public net.minecraft.world.level.chunk.ChunkStatus$LoadingTask
# PotionBrewing # PotionBrewing
public net.minecraft.world.item.alchemy.PotionBrewing f_43496_ # POTION_ITEMS public net.minecraft.world.item.alchemy.PotionBrewing f_43496_ # ALLOWED_CONTAINERS
public net.minecraft.client.gui.Font m_92863_(Lnet/minecraft/resources/ResourceLocation;)Lnet/minecraft/client/gui/font/FontSet; # getFontStorage public net.minecraft.client.gui.Font m_92863_(Lnet/minecraft/resources/ResourceLocation;)Lnet/minecraft/client/gui/font/FontSet; # getFontSet
protected net.minecraft.world.entity.Entity m_19956_(Lnet/minecraft/world/entity/Entity;Lnet/minecraft/world/entity/Entity$MoveFunction;)V # updatePassengerPosition protected net.minecraft.world.entity.Entity m_19956_(Lnet/minecraft/world/entity/Entity;Lnet/minecraft/world/entity/Entity$MoveFunction;)V # positionRider
public net.minecraft.server.level.ChunkMap f_140144_ # field_219266_t public net.minecraft.world.level.biome.BiomeManager f_47863_ # biomeZoomSeed
public net.minecraft.world.level.biome.BiomeManager f_47863_ # seed
public net.minecraft.client.renderer.entity.ItemRenderer f_115096_ # textureManager public net.minecraft.client.renderer.entity.ItemRenderer f_115096_ # textureManager
# Beacon # BeaconBlockEntity
public net.minecraft.world.level.block.entity.BeaconBlockEntity f_58648_ # beamSegments public net.minecraft.world.level.block.entity.BeaconBlockEntity f_58648_ # beamSections
# Server Tick List (For stopping placed fluids from spilling) # ServerTickList (For stopping placed fluids from spilling)
public net.minecraft.world.level.ServerTickList f_47209_ # pendingTickListEntriesHashSet public net.minecraft.world.level.ServerTickList f_47209_ # tickNextTickSet
public net.minecraft.world.level.ServerTickList f_47210_ # pendingTickListEntriesTreeSet public net.minecraft.world.level.ServerTickList f_47210_ # tickNextTickList
# Lightmap information for instanced rendering public net.minecraft.client.Minecraft f_91013_ # pausePartialTick
public net.minecraft.client.renderer.LightTexture f_109872_ #resourceLocation
public net.minecraft.client.Minecraft f_91013_ #renderPartialTicksPaused
# Functions needed to setup a projection matrix
public net.minecraft.client.renderer.GameRenderer f_109065_ #rendererUpdateCount
public net.minecraft.client.renderer.GameRenderer m_109117_(Lcom/mojang/blaze3d/vertex/PoseStack;F)V #bobViewWhenHurt
public net.minecraft.client.renderer.GameRenderer m_109138_(Lcom/mojang/blaze3d/vertex/PoseStack;F)V #bobView
# Expose fog state to the public
public com.mojang.blaze3d.platform.GlStateManager$FogState
public com.mojang.blaze3d.platform.GlStateManager f_84068_ #FOG
public com.mojang.blaze3d.platform.GlStateManager$BooleanState
public com.mojang.blaze3d.platform.GlStateManager$BooleanState f_84586_ #field_179201_b
# GameRenderer # GameRenderer
public net.minecraft.client.renderer.GameRenderer m_109141_(Lnet/minecraft/client/Camera;FZ)D #getFOVModifier public net.minecraft.client.renderer.GameRenderer m_109141_(Lnet/minecraft/client/Camera;FZ)D # getFov
# FirstPersonRenderer # ItemInHandRenderer
public net.minecraft.client.renderer.ItemInHandRenderer f_109300_ # itemStackMainHand public net.minecraft.client.renderer.ItemInHandRenderer f_109300_ # mainHandItem
public net.minecraft.client.renderer.ItemInHandRenderer f_109301_ # itemStackOffHand public net.minecraft.client.renderer.ItemInHandRenderer f_109301_ # offHandItem
# EntityRendererManager # PaletteResize
public net.minecraft.client.renderer.entity.EntityRenderDispatcher f_114364_ # playerRenderer
# IResizeCallback
public net.minecraft.world.level.chunk.PaletteResize public net.minecraft.world.level.chunk.PaletteResize
# Entity
public net.minecraft.world.entity.Entity func_205011_p()V # updateAquatics
public net.minecraft.world.entity.Entity f_19861_ #onGround
# For uploading matrices as vertex attributes.
public com.mojang.math.Matrix3f f_8134_ #a00
public com.mojang.math.Matrix3f f_8135_ #a01
public com.mojang.math.Matrix3f f_8136_ #a02
public com.mojang.math.Matrix3f f_8137_ #a10
public com.mojang.math.Matrix3f f_8138_ #a11
public com.mojang.math.Matrix3f f_8139_ #a12
public com.mojang.math.Matrix3f f_8140_ #a20
public com.mojang.math.Matrix3f f_8141_ #a21
public com.mojang.math.Matrix3f f_8142_ #a22
public com.mojang.math.Matrix4f f_27603_ #a00
public com.mojang.math.Matrix4f f_27604_ #a01
public com.mojang.math.Matrix4f f_27605_ #a02
public com.mojang.math.Matrix4f f_27606_ #a03
public com.mojang.math.Matrix4f f_27607_ #a10
public com.mojang.math.Matrix4f f_27608_ #a11
public com.mojang.math.Matrix4f f_27609_ #a12
public com.mojang.math.Matrix4f f_27610_ #a13
public com.mojang.math.Matrix4f f_27611_ #a20
public com.mojang.math.Matrix4f f_27612_ #a21
public com.mojang.math.Matrix4f f_27613_ #a22
public com.mojang.math.Matrix4f f_27614_ #a23
public com.mojang.math.Matrix4f f_27615_ #a30
public com.mojang.math.Matrix4f f_27616_ #a31
public com.mojang.math.Matrix4f f_27617_ #a32
public com.mojang.math.Matrix4f f_27618_ #a33
public net.minecraft.client.renderer.LevelRenderer f_109409_ #blockBreakingProgressions