Skip to content

Commit

Permalink
initial 1.16.3 update
Browse files Browse the repository at this point in the history
  • Loading branch information
@Thutmose
Thutmose committed Oct 5, 2020
1 parent 2653dd3 commit 348355d
Show file tree
Hide file tree
Showing 17 changed files with 136 additions and 120 deletions.
3 changes: 2 additions & 1 deletion .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,4 +21,5 @@ build/
# other
eclipse
run
*.blend1
*.blend1
logs/*
4 changes: 4 additions & 0 deletions build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -131,11 +131,15 @@ def gitVersion(value) {
def desc = (raw == null ? 'unknown-offset-hash' : grgit.describe(longDescr: true)).split('-') as List
def vers = desc.get(1)
def splis = vers.split(/[.]/)
def majver = splis[0].toInteger()
def subver = splis[1].toInteger()
def offset = splis[2].toInteger()
def ver = offset + 1
if (subver < version_minor.toInteger()){
ver = 0
}
if (majver < version_major.toInteger()){
ver = 0
}
return "${value}.${ver}"
}
17 changes: 9 additions & 8 deletions gradle.properties
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,16 @@
org.gradle.jvmargs=-Xmx3G
org.gradle.daemon=false

version_forge=31.1.0
version_minecraft=1.15.2
version_mcsupport=[1.15.2]
version_mappings=20200203-1.15.1
version_thutcore=7.2.1
version_cct=1.88.1
version_forge=34.1.0
version_minecraft=1.16.3
version_mcsupport=[1.16.3]
version_mappings=20200916-1.16.2

version_major=8
version_minor=2
version_thutcore=8.0.0
version_cct=1.93.0

version_major=9
version_minor=0

compile_name=thuttech
author_name=Thutmose
Binary file renamed libs/thutcore-1.15.2-7.2.1-sources.jar → libs/thutcore-1.16.3-8.0.0-sources.jar
View file
Binary file not shown.
Binary file renamed libs/thutcore-1.15.2-7.2.1.jar → libs/thutcore-1.16.3-8.0.0.jar
View file
Binary file not shown.
20 changes: 11 additions & 9 deletions src/main/java/thut/tech/client/ClientProxy.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,17 +10,17 @@

import net.minecraft.client.Minecraft;
import net.minecraft.client.renderer.IRenderTypeBuffer;
import net.minecraft.client.renderer.Matrix4f;
import net.minecraft.client.renderer.RenderType;
import net.minecraft.client.renderer.RenderTypeLookup;
import net.minecraft.client.renderer.Vector3f;
import net.minecraft.entity.player.PlayerEntity;
import net.minecraft.item.ItemStack;
import net.minecraft.util.math.AxisAlignedBB;
import net.minecraft.util.math.BlockPos;
import net.minecraft.util.math.BlockRayTraceResult;
import net.minecraft.util.math.RayTraceResult.Type;
import net.minecraft.util.math.Vec3d;
import net.minecraft.util.math.vector.Matrix4f;
import net.minecraft.util.math.vector.Vector3d;
import net.minecraft.util.math.vector.Vector3f;
import net.minecraftforge.api.distmarker.Dist;
import net.minecraftforge.api.distmarker.OnlyIn;
import net.minecraftforge.client.event.RenderWorldLastEvent;
Expand Down Expand Up @@ -51,13 +51,15 @@ public void RenderBounds(final RenderWorldLastEvent event)
if (held.getTag() != null && held.getTag().contains("min"))
{
final Minecraft mc = Minecraft.getInstance();
final Vec3d projectedView = mc.gameRenderer.getActiveRenderInfo().getProjectedView();
Vec3d pointed = new Vec3d(projectedView.x, projectedView.y, projectedView.z).add(mc.player.getLook(event
final Vector3d projectedView = mc.gameRenderer.getActiveRenderInfo().getProjectedView();
Vector3d pointed = new Vector3d(projectedView.x, projectedView.y, projectedView.z).add(mc.player
.getLook(
event
.getPartialTicks()));
if (mc.objectMouseOver != null && mc.objectMouseOver.getType() == Type.BLOCK)
{
final BlockRayTraceResult result = (BlockRayTraceResult) mc.objectMouseOver;
pointed = new Vec3d(result.getPos());
pointed = new Vector3d(result.getPos().getX(), result.getPos().getY(), result.getPos().getZ());
//
}
final Vector3 v = Vector3.readFromNBT(held.getTag().getCompound("min"), "");
Expand Down Expand Up @@ -106,7 +108,7 @@ public void RenderBounds(final RenderWorldLastEvent event)

mat.push();

final Matrix4f positionMatrix = mat.getLast().getPositionMatrix();
final Matrix4f positionMatrix = mat.getLast().getMatrix();

final IRenderTypeBuffer.Impl buffer = Minecraft.getInstance().getRenderTypeBuffers().getBufferSource();
final IVertexBuilder builder = buffer.getBuffer(RenderType.LINES);
Expand All @@ -125,7 +127,7 @@ public void setupClient(final FMLClientSetupEvent event)
RenderingRegistry.registerEntityRenderingHandler(EntityLift.TYPE, RenderLift::new);
ClientRegistry.bindTileEntityRenderer(ControllerTile.TYPE, ControllerRenderer::new);

RenderTypeLookup.setRenderLayer(TechCore.LIFTCONTROLLER, t -> (t == RenderType.translucent() || t == RenderType
.cutoutMipped()));
RenderTypeLookup.setRenderLayer(TechCore.LIFTCONTROLLER, t -> (t == RenderType.getTranslucent()
|| t == RenderType.getCutoutMipped()));
}
}
16 changes: 8 additions & 8 deletions src/main/java/thut/tech/client/render/ControllerRenderer.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,15 +14,13 @@
import net.minecraft.client.gui.screen.Screen;
import net.minecraft.client.renderer.BlockRendererDispatcher;
import net.minecraft.client.renderer.IRenderTypeBuffer;
import net.minecraft.client.renderer.Matrix4f;
import net.minecraft.client.renderer.RenderState;
import net.minecraft.client.renderer.RenderState.AlphaState;
import net.minecraft.client.renderer.RenderState.TextureState;
import net.minecraft.client.renderer.RenderState.TransparencyState;
import net.minecraft.client.renderer.RenderState.WriteMaskState;
import net.minecraft.client.renderer.RenderType;
import net.minecraft.client.renderer.RenderTypeLookup;
import net.minecraft.client.renderer.Vector3f;
import net.minecraft.client.renderer.model.IBakedModel;
import net.minecraft.client.renderer.tileentity.TileEntityRenderer;
import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher;
Expand All @@ -31,6 +29,8 @@
import net.minecraft.util.Direction;
import net.minecraft.util.ResourceLocation;
import net.minecraft.util.math.BlockPos;
import net.minecraft.util.math.vector.Matrix4f;
import net.minecraft.util.math.vector.Vector3f;
import net.minecraft.world.World;
import net.minecraftforge.client.model.data.EmptyModelData;
import net.minecraftforge.client.model.data.IModelData;
Expand Down Expand Up @@ -64,7 +64,7 @@ private static void render(final RenderType type, final MatrixStack mat, final I
final float a, final float u1, final float u2, final float v1, final float v2)
{
final IVertexBuilder buffer = buff.getBuffer(type);
final Matrix4f o = mat.getLast().getPositionMatrix();
final Matrix4f o = mat.getLast().getMatrix();
buffer.pos(o, x2, y2, 0).color(r, g, b, a).tex(u1, v1).endVertex();
buffer.pos(o, x2, y1, 0).color(r, g, b, a).tex(u1, v2).endVertex();
buffer.pos(o, x1, y1, 0).color(r, g, b, a).tex(u2, v2).endVertex();
Expand All @@ -85,15 +85,15 @@ private static void render(final RenderType type, final MatrixStack mat, final I

private static RenderType.State getState(final ResourceLocation texture)
{
return RenderType.State.builder().texture(new TextureState(texture, false, true)).transparency(
ControllerRenderer.TRANSP).writeMask(ControllerRenderer.MASK).alpha(ControllerRenderer.ALPHA).build(
false);
return RenderType.State.getBuilder().texture(new TextureState(texture, false, true))
.transparency(ControllerRenderer.TRANSP).writeMask(ControllerRenderer.MASK).alpha(
ControllerRenderer.ALPHA).build(false);
}

public static RenderType makeType(final ResourceLocation tex)
{
return RenderType.get(tex.toString(), DefaultVertexFormats.POSITION_COLOR_TEX, GL11.GL_QUADS, 256, false, true,
ControllerRenderer.getState(tex));
return RenderType.makeType(tex.toString(), DefaultVertexFormats.POSITION_COLOR_TEX, GL11.GL_QUADS, 256, false,
true, ControllerRenderer.getState(tex));
}

private static RenderType NUMBERS = ControllerRenderer.makeType(ControllerRenderer.font);
Expand Down
40 changes: 22 additions & 18 deletions src/main/java/thut/tech/common/CommonProxy.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,10 @@
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.CompoundNBT;
import net.minecraft.util.Hand;
import net.minecraft.util.Util;
import net.minecraft.util.math.AxisAlignedBB;
import net.minecraft.util.math.BlockPos;
import net.minecraft.util.math.Vec3d;
import net.minecraft.util.math.vector.Vector3d;
import net.minecraft.util.text.TranslationTextComponent;
import net.minecraft.world.World;
import net.minecraftforge.common.MinecraftForge;
Expand All @@ -31,22 +32,22 @@ public void interactRightClickBlock(final PlayerInteractEvent.RightClickBlock ev
final ItemStack itemstack = evt.getItemStack();
final PlayerEntity playerIn = evt.getPlayer();
final World worldIn = evt.getWorld();
if (!evt.getPlayer().isShiftKeyDown())
if (!evt.getPlayer().isSneaking())
{
if (itemstack.hasTag())
{
itemstack.getTag().remove("min");
itemstack.getTag().remove("time");
if (itemstack.getTag().isEmpty()) itemstack.setTag(null);
final String message = "msg.lift.reset";
if (!worldIn.isRemote) playerIn.sendMessage(new TranslationTextComponent(message));
if (!worldIn.isRemote) playerIn.sendMessage(new TranslationTextComponent(message), Util.DUMMY_UUID);
evt.setCanceled(true);
}
return;
}

final BlockPos pos = evt.getPos();
if (itemstack.hasTag() && playerIn.isShiftKeyDown() && itemstack.getTag().contains("min"))
if (itemstack.hasTag() && playerIn.isSneaking() && itemstack.getTag().contains("min"))
{
final CompoundNBT minTag = itemstack.getTag().getCompound("min");
itemstack.getTag().putLong("time", worldIn.getGameTime());
Expand All @@ -62,7 +63,7 @@ public void interactRightClickBlock(final PlayerInteractEvent.RightClickBlock ev
if (max.getY() - min.getY() > TechCore.config.maxHeight || dw > 2 * TechCore.config.maxRadius + 1)
{
final String message = "msg.lift.toobig";
if (!worldIn.isRemote) playerIn.sendMessage(new TranslationTextComponent(message));
if (!worldIn.isRemote) playerIn.sendMessage(new TranslationTextComponent(message), Util.DUMMY_UUID);
return;
}
final int num = (dw + 1) * (max.getY() - min.getY() + 1);
Expand All @@ -72,18 +73,19 @@ public void interactRightClickBlock(final PlayerInteractEvent.RightClickBlock ev
if (!playerIn.abilities.isCreativeMode && count < num)
{
final String message = "msg.lift.noblock";
if (!worldIn.isRemote) playerIn.sendMessage(new TranslationTextComponent(message, num));
if (!worldIn.isRemote) playerIn.sendMessage(new TranslationTextComponent(message, num),
Util.DUMMY_UUID);
return;
}
else if (!playerIn.abilities.isCreativeMode) playerIn.inventory.clearMatchingItems(b -> b
.getItem() == TechCore.LIFT, num);
else if (!playerIn.abilities.isCreativeMode) playerIn.inventory.func_234564_a_(b -> b
.getItem() == TechCore.LIFT, num, playerIn.container.func_234641_j_());
if (!worldIn.isRemote)
{
final EntityLift lift = IBlockEntity.BlockEntityFormer.makeBlockEntity(worldIn, min, max, mid,
EntityLift.TYPE);
if (lift != null) lift.owner = playerIn.getUniqueID();
final String message = lift != null ? "msg.lift.create" : "msg.lift.fail";
playerIn.sendMessage(new TranslationTextComponent(message));
playerIn.sendMessage(new TranslationTextComponent(message), Util.DUMMY_UUID);
}
itemstack.getTag().remove("min");
evt.setCanceled(true);
Expand All @@ -95,7 +97,7 @@ else if (!playerIn.abilities.isCreativeMode) playerIn.inventory.clearMatchingIte
Vector3.getNewVector().set(pos).writeToNBT(min, "");
itemstack.getTag().put("min", min);
final String message = "msg.lift.setcorner";
if (!worldIn.isRemote) playerIn.sendMessage(new TranslationTextComponent(message, pos));
if (!worldIn.isRemote) playerIn.sendMessage(new TranslationTextComponent(message, pos), Util.DUMMY_UUID);
evt.setCanceled(true);
itemstack.getTag().putLong("time", worldIn.getGameTime());
}
Expand All @@ -110,7 +112,7 @@ public void interactRightClickBlock(final PlayerInteractEvent.RightClickItem evt
final PlayerEntity playerIn = evt.getPlayer();
final World worldIn = evt.getWorld();

if (!evt.getPlayer().isShiftKeyDown())
if (!evt.getPlayer().isSneaking())
{
if (itemstack.hasTag())
{
Expand All @@ -119,7 +121,7 @@ public void interactRightClickBlock(final PlayerInteractEvent.RightClickItem evt
if (itemstack.getTag().isEmpty()) itemstack.setTag(null);
}
final String message = "msg.lift.reset";
if (!worldIn.isRemote) playerIn.sendMessage(new TranslationTextComponent(message));
if (!worldIn.isRemote) playerIn.sendMessage(new TranslationTextComponent(message), Util.DUMMY_UUID);
return;
}

Expand All @@ -128,7 +130,8 @@ public void interactRightClickBlock(final PlayerInteractEvent.RightClickItem evt
if (validTag && !alreadyUsed)
{
final CompoundNBT minTag = itemstack.getTag().getCompound("min");
final Vec3d loc = playerIn.getPositionVector().add(0, playerIn.getEyeHeight(), 0).add(playerIn.getLookVec()
final Vector3d loc = playerIn.getPositionVec().add(0, playerIn.getEyeHeight(), 0).add(playerIn
.getLookVec()
.scale(2));
final BlockPos pos = new BlockPos(loc);
BlockPos min = pos;
Expand All @@ -143,7 +146,7 @@ public void interactRightClickBlock(final PlayerInteractEvent.RightClickItem evt
if (max.getY() - min.getY() > TechCore.config.maxHeight || dw > 2 * TechCore.config.maxRadius + 1)
{
final String message = "msg.lift.toobig";
if (!worldIn.isRemote) playerIn.sendMessage(new TranslationTextComponent(message));
if (!worldIn.isRemote) playerIn.sendMessage(new TranslationTextComponent(message), Util.DUMMY_UUID);
return;
}
final int num = (dw + 1) * (max.getY() - min.getY() + 1);
Expand All @@ -153,18 +156,19 @@ public void interactRightClickBlock(final PlayerInteractEvent.RightClickItem evt
if (!playerIn.abilities.isCreativeMode && count < num)
{
final String message = "msg.lift.noblock";
if (!worldIn.isRemote) playerIn.sendMessage(new TranslationTextComponent(message, num));
if (!worldIn.isRemote) playerIn.sendMessage(new TranslationTextComponent(message, num),
Util.DUMMY_UUID);
return;
}
else if (!playerIn.abilities.isCreativeMode) playerIn.inventory.clearMatchingItems(i -> i
.getItem() == TechCore.LIFT, num);
else if (!playerIn.abilities.isCreativeMode) playerIn.inventory.func_234564_a_(i -> i
.getItem() == TechCore.LIFT, num, playerIn.container.func_234641_j_());
if (!worldIn.isRemote)
{
final EntityLift lift = IBlockEntity.BlockEntityFormer.makeBlockEntity(worldIn, min, max, mid,
EntityLift.TYPE);
if (lift != null) lift.owner = playerIn.getUniqueID();
final String message = lift != null ? "msg.lift.create" : "msg.lift.fail";
playerIn.sendMessage(new TranslationTextComponent(message));
playerIn.sendMessage(new TranslationTextComponent(message), Util.DUMMY_UUID);
}
itemstack.getTag().remove("min");
}
Expand Down
3 changes: 2 additions & 1 deletion src/main/java/thut/tech/common/TechCore.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,8 @@ public static void registerTiles(final RegistryEvent.Register<TileEntityType<?>>
public final static PacketHandler packets = new PacketHandler(new ResourceLocation(Reference.MOD_ID, "comms"),
Reference.NETVERSION);

public static final CommonProxy proxy = DistExecutor.runForDist(() -> () -> new ClientProxy(),
public static final CommonProxy proxy = DistExecutor.safeRunForDist(
() -> () -> new ClientProxy(),
() -> () -> new CommonProxy());

public static Block LIFTCONTROLLER;
Expand Down
20 changes: 12 additions & 8 deletions src/main/java/thut/tech/common/blocks/lift/ControllerBlock.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
import net.minecraft.util.ActionResultType;
import net.minecraft.util.Direction;
import net.minecraft.util.Hand;
import net.minecraft.util.Util;
import net.minecraft.util.math.BlockPos;
import net.minecraft.util.math.BlockRayTraceResult;
import net.minecraft.util.text.TranslationTextComponent;
Expand Down Expand Up @@ -124,7 +125,7 @@ public ActionResultType onBlockActivated(final BlockState state, final World wor
final ItemStack heldItem = playerIn.getHeldItem(handIn);
final Direction side = hit.getFace();
final boolean linkerOrStick = heldItem.getItem() == Items.STICK || heldItem.getItem() == TechCore.LINKER;
if (linkerOrStick && playerIn.isShiftKeyDown())
if (linkerOrStick && playerIn.isSneaking())
{
final ControllerTile te = (ControllerTile) worldIn.getTileEntity(pos);
if (te == null) return ActionResultType.PASS;
Expand Down Expand Up @@ -173,7 +174,7 @@ else if (te.isSideOn(side)) if (heldItem.getItem() == TechCore.LINKER)
}
return ActionResultType.SUCCESS;
}
else if (!playerIn.isShiftKeyDown())
else if (!playerIn.isSneaking())
{
final float hitX = (float) hit.getHitVec().x;
final float hitY = (float) hit.getHitVec().y;
Expand All @@ -182,22 +183,25 @@ else if (!playerIn.isShiftKeyDown())
: ActionResultType.PASS;
}

if (playerIn.isShiftKeyDown() && handIn == Hand.MAIN_HAND && playerIn instanceof ServerPlayerEntity)
if (playerIn.isSneaking() && handIn == Hand.MAIN_HAND && playerIn instanceof ServerPlayerEntity)
{
final boolean sideOn = !te.isSideOn(side);
playerIn.sendMessage(new TranslationTextComponent("msg.lift.side." + (sideOn ? "on" : "off")));
playerIn.sendMessage(new TranslationTextComponent("msg.lift.side." + (sideOn ? "on" : "off")),
Util.DUMMY_UUID);
if (sideOn)
{
final boolean call = te.isCallPanel(side);
final boolean edit = te.isEditMode(side);
final boolean display = te.isFloorDisplay(side);
if (edit) playerIn.sendMessage(new TranslationTextComponent("msg.lift.side.edit"));
else if (call) playerIn.sendMessage(new TranslationTextComponent("msg.lift.side.call"));
else if (display) playerIn.sendMessage(new TranslationTextComponent("msg.lift.side.display"));
if (edit) playerIn.sendMessage(new TranslationTextComponent("msg.lift.side.edit"), Util.DUMMY_UUID);
else if (call) playerIn.sendMessage(new TranslationTextComponent("msg.lift.side.call"),
Util.DUMMY_UUID);
else if (display) playerIn.sendMessage(new TranslationTextComponent("msg.lift.side.display"),
Util.DUMMY_UUID);
else
{
final int page = te.getSidePage(side);
playerIn.sendMessage(new TranslationTextComponent("msg.lift.side.page", page));
playerIn.sendMessage(new TranslationTextComponent("msg.lift.side.page", page), Util.DUMMY_UUID);
}
}
}
Expand Down
Loading

0 comments on commit 348355d

Please sign in to comment.