Updated to work with Forge 41.0.94+

GirafiStudios · Jul 24, 2022 · bffb304 · bffb304
1 parent 66f93d6
commit bffb304
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 9 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -1,6 +1,6 @@
 minecraft_version=1.19
-forge_version=41.0.5
-mod_version=2.6.0
+forge_version=41.0.110
+mod_version=2.6.1
 
 org.gradle.jvmargs=-Xmx4G
 org.gradle.daemon=false
diff --git a/src/main/java/com/girafi/passthroughsigns/api/PassthroughSignsAPI.java b/src/main/java/com/girafi/passthroughsigns/api/PassthroughSignsAPI.java
@@ -21,8 +21,8 @@ public class PassthroughSignsAPI {
      */
     public static void setCanBePassed(String string) {
         ResourceLocation resourceLocation = new ResourceLocation(string);
-        if (ForgeRegistries.ENTITIES.containsKey(resourceLocation)) {
-            ENTITY_PASSABLES.add(ForgeRegistries.ENTITIES.getValue(resourceLocation));
+        if (ForgeRegistries.ENTITY_TYPES.containsKey(resourceLocation)) {
+            ENTITY_PASSABLES.add(ForgeRegistries.ENTITY_TYPES.getValue(resourceLocation));
         } else if (ForgeRegistries.BLOCKS.containsKey(resourceLocation)) {
             BLOCK_PASSABLES.add(ForgeRegistries.BLOCKS.getValue(resourceLocation));
         }

diff --git a/src/main/java/com/girafi/passthroughsigns/util/PassableHandler.java b/src/main/java/com/girafi/passthroughsigns/util/PassableHandler.java
@@ -28,10 +28,10 @@ public class PassableHandler {
 
     @SubscribeEvent
     public static void onPlayerInteract(PlayerInteractEvent.RightClickBlock event) {
-        Level level = event.getWorld();
+        Level level = event.getLevel();
         BlockPos pos = event.getPos();
         BlockState state = level.getBlockState(pos);
-        Player player = event.getPlayer();
+        Player player = event.getEntity();
         Block block = state.getBlock();
         if (block instanceof WallSignBlock && GENERAL.shouldWallSignBePassable.get() || block instanceof WallBannerBlock && GENERAL.shouldBannerBePassable.get() ||
                 block instanceof IPassable && ((IPassable) block).canBePassed(level, pos, IPassable.EnumPassableType.WALL_BLOCK) ||
@@ -57,9 +57,9 @@ public static void onPlayerInteract(PlayerInteractEvent.RightClickBlock event) {
 
     @SubscribeEvent
     public static void onEntityInteract(PlayerInteractEvent.EntityInteract event) {
-        Level level = event.getWorld();
+        Level level = event.getLevel();
         BlockPos pos = event.getPos();
-        Player player = event.getPlayer();
+        Player player = event.getEntity();
         Entity entity = event.getTarget();
 
         if (entity instanceof ItemFrame && GENERAL.shouldItemFrameBePassable.get() || entity instanceof Painting && GENERAL.shouldPaintingsBePassable.get() ||

diff --git a/src/main/resources/META-INF/mods.toml b/src/main/resources/META-INF/mods.toml
@@ -15,6 +15,6 @@ license="All rights reserved"
 [[dependencies.passthroughsigns]]
     modId="forge"
     mandatory=true
-    versionRange="[41,)"
+    versionRange="[41.0.94,)"
     ordering="AFTER"
     side="BOTH"