Skip to content

Commit

Permalink
Ported to 1.16.2
Browse files Browse the repository at this point in the history
  • Loading branch information
GirafiStudios committed Aug 15, 2020
1 parent c87f9f8 commit e3467e4
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 14 deletions.
8 changes: 4 additions & 4 deletions gradle.properties
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
minecraft_version=1.16.1
forge_version=32.0.38
mappings=20200514-1.16
mod_version=2.3.5
minecraft_version=1.16.2
forge_version=33.0.5
mappings=20200723-1.16.1
mod_version=2.3.6

org.gradle.jvmargs=-Xmx4G
org.gradle.daemon=false
Original file line number Diff line number Diff line change
Expand Up @@ -8,17 +8,13 @@
import net.minecraft.entity.item.ItemFrameEntity;
import net.minecraft.entity.item.PaintingEntity;
import net.minecraft.entity.player.PlayerEntity;
import net.minecraft.item.BlockItem;
import net.minecraft.item.ItemStack;
import net.minecraft.state.StateHolder;
import net.minecraft.util.Direction;
import net.minecraft.util.Hand;
import net.minecraft.util.math.BlockPos;
import net.minecraft.util.math.BlockRayTraceResult;
import net.minecraft.util.math.vector.Vector3d;
import net.minecraft.world.World;
import net.minecraftforge.event.entity.player.PlayerInteractEvent;
import net.minecraftforge.eventbus.api.Event;
import net.minecraftforge.eventbus.api.SubscribeEvent;
import net.minecraftforge.fml.ModList;
import net.minecraftforge.fml.common.Mod.EventBusSubscriber;
Expand All @@ -40,12 +36,12 @@ public static void onPlayerInteract(PlayerInteractEvent.RightClickBlock event) {
block instanceof IPassable && ((IPassable) block).canBePassed(world, pos, IPassable.EnumPassableType.WALL_BLOCK) ||
PassthroughSignsAPI.BLOCK_PASSABLES.contains(block)) {
Direction facingOpposite = Direction.NORTH.getOpposite();
if (state.func_235901_b_(DirectionalBlock.FACING)) {
if (state.hasProperty(DirectionalBlock.FACING)) {
facingOpposite = state.get(DirectionalBlock.FACING).getOpposite();
} else if (state.func_235901_b_(HorizontalBlock.HORIZONTAL_FACING)) {
} else if (state.hasProperty(HorizontalBlock.HORIZONTAL_FACING)) {
facingOpposite = state.get(HorizontalBlock.HORIZONTAL_FACING).getOpposite();
}

if (block instanceof WallSignBlock) {
if (IS_QUARK_LOADED && player.isCrouching() && GENERAL.shiftClickQuark.get()) {
rightClick(world, pos, player, event.getHand(), facingOpposite);
Expand Down
5 changes: 3 additions & 2 deletions src/main/resources/META-INF/mods.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
modLoader="javafml"
loaderVersion="[30,)"
loaderVersion="[32,)"
issueTrackerURL="https://github.com/dmillerw/PassthroughSigns/issues"
license="All rights reserved"

[[mods]]
modId="passthroughsigns"
Expand All @@ -14,6 +15,6 @@ issueTrackerURL="https://github.com/dmillerw/PassthroughSigns/issues"
[[dependencies.passthroughsigns]]
modId="forge"
mandatory=true
versionRange="[30,)"
versionRange="[32,)"
ordering="AFTER"
side="BOTH"
2 changes: 1 addition & 1 deletion src/main/resources/pack.mcmeta
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"pack": {
"pack_format": 5,
"pack_format": 6,
"description": "Resources used for Passthrough Signs"
}
}

0 comments on commit e3467e4

Please sign in to comment.