R3944Realms/CarryOn
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Updated to 1.16.3

Browse Source
This commit is contained in:
Tschipp 2020-10-06 13:36:19 +02:00
parent 894568d64a
commit bea813023c
5 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gradle.properties
View File

@ -1,7 +1,7 @@
# Sets default memory used for gradle commands. Can be overridden by user or command line properties. # Sets default memory used for gradle commands. Can be overridden by user or command line properties.
# This is required to provide enough memory for the Minecraft decompilation process. # This is required to provide enough memory for the Minecraft decompilation process.
org.gradle.jvmargs=-Xmx3G org.gradle.jvmargs=-Xmx3G
version=1.14.0 version=1.15.0
minecraft_version=1.16.2 minecraft_version=1.16.3
mcp_mappings=20200723-1.16.1 mcp_mappings=20200916-1.16.2
forge_version=33.0.37 forge_version=34.1.10

4
src/main/java/tschipp/carryon/client/helper/CarryRenderHelper.java
View File

@ -74,8 +74,8 @@ public class CarryRenderHelper
public static int getPerspective() public static int getPerspective()
{ {
boolean isThirdPerson = !Minecraft.getInstance().gameSettings.func_243230_g().func_243192_a(); boolean isThirdPerson = !Minecraft.getInstance().gameSettings.getPointOfView().func_243192_a(); //isThirdPerson
boolean isThirdPersonReverse = Minecraft.getInstance().gameSettings.func_243230_g().func_243193_b(); boolean isThirdPersonReverse = Minecraft.getInstance().gameSettings.getPointOfView().func_243193_b();
if (!isThirdPerson && !isThirdPersonReverse) if (!isThirdPerson && !isThirdPersonReverse)
return 0; return 0;

2
src/main/java/tschipp/carryon/common/event/ItemEvents.java
View File

@ -539,7 +539,7 @@ public class ItemEvents
{ {
if (player instanceof ServerPlayerEntity) if (player instanceof ServerPlayerEntity)
{ {
CarryOn.network.send(PacketDistributor.NEAR.with(() -> new TargetPoint(player.getPosX(), player.getPosY(), player.getPosZ(), 128, player.world.func_234923_W_())), new CarrySlotPacket(currentItem, player.getEntityId(), hash)); CarryOn.network.send(PacketDistributor.NEAR.with(() -> new TargetPoint(player.getPosX(), player.getPosY(), player.getPosZ(), 128, player.world.getDimensionKey())), new CarrySlotPacket(currentItem, player.getEntityId(), hash));
CarryOn.network.send(PacketDistributor.PLAYER.with(() -> (ServerPlayerEntity) player), new CarrySlotPacket(currentItem, player.getEntityId(), hash)); CarryOn.network.send(PacketDistributor.PLAYER.with(() -> (ServerPlayerEntity) player), new CarrySlotPacket(currentItem, player.getEntityId(), hash));
if (currentItem >= 9) if (currentItem >= 9)

2
src/main/java/tschipp/carryon/common/item/ItemCarryonBlock.java
View File

@ -138,7 +138,7 @@ public class ItemCarryonBlock extends Item
// } // }
// } // }
BlockSnapshot snapshot = BlockSnapshot.create(world.func_234923_W_(), world, pos2); BlockSnapshot snapshot = BlockSnapshot.create(world.getDimensionKey(), world, pos2);
EntityPlaceEvent event = new EntityPlaceEvent(snapshot, world.getBlockState(pos), player); EntityPlaceEvent event = new EntityPlaceEvent(snapshot, world.getBlockState(pos), player);
MinecraftForge.EVENT_BUS.post(event); MinecraftForge.EVENT_BUS.post(event);

6
src/main/resources/META-INF/mods.toml
View File

@ -1,5 +1,5 @@
modLoader="javafml" modLoader="javafml"
loaderVersion="[33,)" loaderVersion="[34,)"
issueTrackerURL="https://github.com/Tschipp/CarryOn/issues" issueTrackerURL="https://github.com/Tschipp/CarryOn/issues"
logoFile="logo.png" logoFile="logo.png"
license="GNU LGPLv3" license="GNU LGPLv3"
@ -18,7 +18,7 @@ license="GNU LGPLv3"
# Does this dependency have to exist - if not, ordering below must be specified # Does this dependency have to exist - if not, ordering below must be specified
mandatory=true #mandatory mandatory=true #mandatory
# The version range of the dependency # The version range of the dependency
versionRange="[33.0.37,)" #mandatory versionRange="[34.1.10,)" #mandatory
# An ordering relationship for the dependency - BEFORE or AFTER required if the relationship is not mandatory # An ordering relationship for the dependency - BEFORE or AFTER required if the relationship is not mandatory
ordering="NONE" ordering="NONE"
# Side this dependency is applied on - BOTH, CLIENT or SERVER # Side this dependency is applied on - BOTH, CLIENT or SERVER
@ -27,6 +27,6 @@ license="GNU LGPLv3"
[[dependencies.carryon]] [[dependencies.carryon]]
modId="minecraft" modId="minecraft"
mandatory=true mandatory=true
versionRange="[1.16,1.17)" versionRange="[1.16.3,1.17)"
ordering="NONE" ordering="NONE"
side="BOTH" side="BOTH"