Upgrade to 1.14.3!

This commit is contained in:
alexbegt 2019-07-19 22:20:05 -04:00
parent ba182f6b20
commit 55a7af27e3
7 changed files with 31 additions and 12 deletions

View File

@ -3,9 +3,9 @@ Iron Chests [![Curseforge](http://cf.way2muchnoise.eu/full_iron-chests_downloads
Iron Chests! A mod that adds new chests. Iron Chests! A mod that adds new chests.
Please note that the Shulker Boxes in 1.13 have been moved to their own mod: [Iron Shulker Boxes](https://minecraft.curseforge.com/projects/iron-shulker-boxes) Please note that the Shulker Boxes in 1.13+ have been moved to their own mod: [Iron Shulker Boxes](https://minecraft.curseforge.com/projects/iron-shulker-boxes)
For issues with the Shulker Boxes starting in 1.13, Please report them to [Iron Shulker Boxes](https://github.com/progwml6/ironshulkerboxes) For issues with the Shulker Boxes starting in 1.13+, Please report them to [Iron Shulker Boxes](https://github.com/progwml6/ironshulkerboxes)
## Setting up a Workspace/Compiling from Source ## Setting up a Workspace/Compiling from Source
Note: Git MUST be installed and in the system path to use our scripts. Note: Git MUST be installed and in the system path to use our scripts.

View File

@ -34,7 +34,7 @@ minecraft {
workingDirectory project.file('run') workingDirectory project.file('run')
// Recommended logging data for a userdev environment // Recommended logging data for a userdev environment
property 'forge.logging.markers', 'SCAN,REGISTRIES,REGISTRYDUMP' property 'forge.logging.markers', 'SCAN,REGISTRIES,REGISTRYDUMP,CORE'
// Recommended logging level for the console // Recommended logging level for the console
property 'forge.logging.console.level', 'debug' property 'forge.logging.console.level', 'debug'
@ -50,7 +50,7 @@ minecraft {
workingDirectory project.file('run') workingDirectory project.file('run')
// Recommended logging data for a userdev environment // Recommended logging data for a userdev environment
property 'forge.logging.markers', 'SCAN,REGISTRIES,REGISTRYDUMP' property 'forge.logging.markers', 'SCAN,REGISTRIES,REGISTRYDUMP,CORE'
// Recommended logging level for the console // Recommended logging level for the console
property 'forge.logging.console.level', 'debug' property 'forge.logging.console.level', 'debug'
@ -61,6 +61,24 @@ minecraft {
} }
} }
} }
data {
workingDirectory project.file('run')
// Recommended logging data for a userdev environment
property 'forge.logging.markers', 'SCAN,REGISTRIES,REGISTRYDUMP,CORE'
// Recommended logging level for the console
property 'forge.logging.console.level', 'debug'
args '--mod', 'ironchest', '--all', '--output', file('generated/resources/')
mods {
ironchest {
source sourceSets.main
}
}
}
} }
} }

View File

@ -7,12 +7,12 @@ org.gradle.daemon=false
mod_version=9.0 mod_version=9.0
# Minecraft Version Information # Minecraft Version Information
minecraft_version=1.14.2 minecraft_version=1.14.3
minecraft_version_toml=14 minecraft_version_toml=14
# Forge Version Information # Forge Version Information
forge_version=26.0.16 forge_version=27.0.60
forge_version_toml=26 forge_version_toml=27
# Mappings Information # Mappings Information
mappings_version=20190609-1.14.2 mappings_version=20190719-1.14.3

View File

@ -123,7 +123,7 @@ public class IronChestTileEntityRenderer<T extends TileEntity & IChestLid> exten
if (this.rendererDispatcher.renderInfo != null) if (this.rendererDispatcher.renderInfo != null)
{ {
if (chestType.isTransparent() && tileEntity.getDistanceSq(this.rendererDispatcher.renderInfo.func_216785_c().x, this.rendererDispatcher.renderInfo.func_216785_c().y, this.rendererDispatcher.renderInfo.func_216785_c().z) < 128d) if (chestType.isTransparent() && tileEntity.getDistanceSq(this.rendererDispatcher.renderInfo.getProjectedView().x, this.rendererDispatcher.renderInfo.getProjectedView().y, this.rendererDispatcher.renderInfo.getProjectedView().z) < 128d)
{ {
this.random.setSeed(254L); this.random.setSeed(254L);
float shiftX; float shiftX;

View File

@ -116,7 +116,7 @@ public class ChestContainer extends Container
public ChestContainer(ContainerType<?> containerType, int windowId, PlayerInventory playerInventory, IInventory inventory, ChestType chestType) public ChestContainer(ContainerType<?> containerType, int windowId, PlayerInventory playerInventory, IInventory inventory, ChestType chestType)
{ {
super(containerType, windowId); super(containerType, windowId);
func_216962_a(inventory, chestType.size); assertInventorySize(inventory, chestType.size);
this.inventory = inventory; this.inventory = inventory;
this.chestType = chestType; this.chestType = chestType;

View File

@ -20,6 +20,7 @@ import net.minecraft.entity.player.PlayerInventory;
import net.minecraft.inventory.container.Container; import net.minecraft.inventory.container.Container;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import net.minecraft.util.NonNullList; import net.minecraft.util.NonNullList;
import net.minecraft.world.chunk.Chunk;
import net.minecraftforge.fml.network.PacketDistributor; import net.minecraftforge.fml.network.PacketDistributor;
import java.util.Collections; import java.util.Collections;
@ -221,7 +222,7 @@ public class CrystalChestTileEntity extends IronChestTileEntity
{ {
NonNullList<ItemStack> stacks = this.buildItemStackDataList(); NonNullList<ItemStack> stacks = this.buildItemStackDataList();
PacketHandler.send(PacketDistributor.TRACKING_CHUNK.with(() -> this.getWorld().getChunk(this.getPos())), new PacketTopStackSyncChest(this.getWorld().getDimension().getType().getId(), this.getPos(), stacks)); PacketHandler.send(PacketDistributor.TRACKING_CHUNK.with(() -> (Chunk) this.getWorld().getChunk(this.getPos())), new PacketTopStackSyncChest(this.getWorld().getDimension().getType().getId(), this.getPos(), stacks));
} }
public void receiveMessageFromServer(NonNullList<ItemStack> topStacks) public void receiveMessageFromServer(NonNullList<ItemStack> topStacks)

View File

@ -283,7 +283,7 @@ public class IronChestTileEntity extends LockableLootTileEntity implements IChes
@OnlyIn(Dist.CLIENT) @OnlyIn(Dist.CLIENT)
public float getLidAngle(float partialTicks) public float getLidAngle(float partialTicks)
{ {
return MathHelper.func_219799_g(partialTicks, this.prevLidAngle, this.lidAngle); return MathHelper.lerp(partialTicks, this.prevLidAngle, this.lidAngle);
} }
public static int getPlayersUsing(IBlockReader reader, BlockPos posIn) public static int getPlayersUsing(IBlockReader reader, BlockPos posIn)