fujin/Applied-Energistics-2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1.16 port

Browse Source
This commit is contained in:
yueh
2020-07-22 16:44:42 +02:00
parent 662dbca3e1
commit 56ecda5173
225 changed files with 1214 additions and 969 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/appeng/helpers/AEMaterials.java
+3 -5
View File
@@ -24,7 +24,7 @@ import net.minecraft.block.material.PushReaction;
public class AEMaterials {
public static final Material GLASS = make(MaterialColor.AIR, false, false, true, false, true, false, false,
public static final Material GLASS = make(MaterialColor.AIR, false, false, true, false, false, false,
PushReaction.NORMAL);
/**
@@ -42,10 +42,8 @@ public class AEMaterials {
* @return
*/
private static Material make(MaterialColor color, boolean isLiquid, boolean isSolid, boolean blocksMovement,
boolean isOpaque, boolean requiresNoTool, boolean flammable, boolean replaceable,
PushReaction pushReaction) {
return new Material(color, isLiquid, isSolid, blocksMovement, isOpaque, requiresNoTool, flammable, replaceable,
pushReaction);
boolean isOpaque, boolean flammable, boolean replaceable, PushReaction pushReaction) {
return new Material(color, isLiquid, isSolid, blocksMovement, isOpaque, flammable, replaceable, pushReaction);
}
}
src/main/java/appeng/helpers/DualityInterface.java
+3 -3
View File
@@ -42,7 +42,7 @@ import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.Direction;
import net.minecraft.util.math.BlockPos;
import net.minecraft.util.math.BlockRayTraceResult;
import net.minecraft.util.math.Vec3d;
import net.minecraft.util.math.vector.Vector3d;
import net.minecraft.util.text.ITextComponent;
import net.minecraft.util.text.StringTextComponent;
import net.minecraft.util.text.TranslationTextComponent;
@@ -966,11 +966,11 @@ public class DualityInterface implements IGridTickable, IStorageMonitorable, IIn
final Block directedBlock = directedBlockState.getBlock();
ItemStack what = new ItemStack(directedBlock, 1);
try {
Vec3d from = new Vec3d(hostTile.getPos().getX() + 0.5, hostTile.getPos().getY() + 0.5,
Vector3d from = new Vector3d(hostTile.getPos().getX() + 0.5, hostTile.getPos().getY() + 0.5,
hostTile.getPos().getZ() + 0.5);
from = from.add(direction.getXOffset() * 0.501, direction.getYOffset() * 0.501,
direction.getZOffset() * 0.501);
final Vec3d to = from.add(direction.getXOffset(), direction.getYOffset(), direction.getZOffset());
final Vector3d to = from.add(direction.getXOffset(), direction.getYOffset(), direction.getZOffset());
final BlockRayTraceResult hit = null;// hostWorld.rayTraceBlocks( from, to ); //FIXME:
// https://github.com/MinecraftForge/MinecraftForge/pull/6708
if (hit != null && !BAD_BLOCKS.contains(directedBlock)) {
src/main/java/appeng/helpers/Splotch.java
+2 -2
View File
@@ -20,7 +20,7 @@ package appeng.helpers;
import net.minecraft.network.PacketBuffer;
import net.minecraft.util.Direction;
import net.minecraft.util.math.Vec3d;
import net.minecraft.util.math.vector.Vector3d;
import appeng.api.util.AEColor;
@@ -31,7 +31,7 @@ public class Splotch {
private final AEColor color;
private final int pos;
public Splotch(final AEColor col, final boolean lit, final Direction side, final Vec3d position) {
public Splotch(final AEColor col, final boolean lit, final Direction side, final Vector3d position) {
this.color = col;
this.lumen = lit;