Merge pull request #5 from Keridos/master

Update Lever Block once again and fix IC2 integration

dependencies.gradle

@@ -3,10 +3,9 @@
 dependencies {
     implementation("curse.maven:cofh-lib-220333:2388748")
 
-    compileOnly 'com.github.GTNewHorizons:waila:1.7.3:dev'
-    compileOnly 'com.github.GTNewHorizons:NotEnoughItems:2.5.27-GTNH:dev'
-    compileOnly 'com.github.GTNewHorizons:OpenComputers:1.10.11-GTNH:dev'
-
+    compileOnly 'com.github.GTNewHorizons:waila:1.8.1:dev'
+    compileOnly 'com.github.GTNewHorizons:NotEnoughItems:2.6.35-GTNH:dev'
+    compileOnly 'com.github.GTNewHorizons:OpenComputers:1.10.23-GTNH:dev'
     compileOnly 'net.industrial-craft:industrialcraft-2:2.2.828-experimental:dev'
     compileOnly("thaumcraft:Thaumcraft:1.7.10-4.2.3.5:dev")
     compileOnly("curse.maven:computercraft-67504:2269339")

gradle.properties

@@ -41,7 +41,7 @@ developmentEnvironmentUserName = Developer
 
 # Enables using modern Java syntax (up to version 17) via Jabel, while still targeting JVM 8.
 # See https://github.com/bsideup/jabel for details on how this works.
-enableModernJavaSyntax = false
+enableModernJavaSyntax = true
 
 # Enables injecting missing generics into the decompiled source code for a better coding experience.
 # Turns most publicly visible List, Map, etc. into proper List<E>, Map<K, V> types.
@@ -85,6 +85,11 @@ accessTransformersFile =
 # Provides setup for Mixins if enabled. If you don't know what mixins are: Keep it disabled!
 usesMixins = false
 
+# Set to a non-empty string to configure mixins in a separate source set under src/VALUE, instead of src/main.
+# This can speed up compile times thanks to not running the mixin annotation processor on all input sources.
+# Mixin classes will have access to "main" classes, but not the other way around.
+separateMixinSourceSet =
+
 # Adds some debug arguments like verbose output and class export.
 usesMixinDebug = false
 
@@ -117,9 +122,15 @@ minimizeShadowedDependencies = true
 # If disabled, won't rename the shadowed classes.
 relocateShadowedDependencies = true
 
-# Adds the GTNH maven, CurseMaven, Modrinth, and some more well-known 1.7.10 repositories.
+# Adds CurseMaven, Modrinth, and some more well-known 1.7.10 repositories.
 includeWellKnownRepositories = true
 
+# A list of repositories to exclude from the includeWellKnownRepositories setting. Should be a space separated
+# list of strings, with the acceptable keys being(case does not matter):
+# cursemaven
+# modrinth
+excludeWellKnownRepositories =
+
 # Change these to your Maven coordinates if you want to publish to a custom Maven repository instead of the default GTNH Maven.
 # Authenticate with the MAVEN_USER and MAVEN_PASSWORD environment variables.
 # If you need a more complex setup disable maven publishing here and add a publishing repository to addon.gradle.

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

gradlew

@@ -15,6 +15,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 
 ##############################################################################
 #
@@ -55,7 +57,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.
@@ -84,7 +86,8 @@ done
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
 # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
-APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
+' "$PWD" ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum

gradlew.bat

@@ -13,6 +13,8 @@
 @rem See the License for the specific language governing permissions and
 @rem limitations under the License.
 @rem
+@rem SPDX-License-Identifier: Apache-2.0
+@rem
 
 @if "%DEBUG%"=="" @echo off
 @rem ##########################################################################

settings.gradle

@@ -17,7 +17,7 @@ pluginManagement {
 }
 
 plugins {
-    id 'com.gtnewhorizons.gtnhsettingsconvention' version '1.0.22'
+    id 'com.gtnewhorizons.gtnhsettingsconvention' version '1.0.27'
 }
 
 

src/main/java/openmodularturrets/blocks/expanders/BlockExpanderInvTierFive.java

@@ -29,14 +29,14 @@ public BlockExpanderInvTierFive() {
     }
 
     @Override
-    public void registerBlockIcons(IIconRegister p_149651_1_) {
-        super.registerBlockIcons(p_149651_1_);
-        blockIcon = p_149651_1_.registerIcon(ModInfo.ID.toLowerCase() + ":expanderInvTierFive");
+    public void registerBlockIcons(IIconRegister reg) {
+        super.registerBlockIcons(reg);
+        blockIcon = reg.registerIcon(ModInfo.ID.toLowerCase() + ":expanderInvTierFive");
     }
 
     @Override
-    public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int p_149727_6_,
-            float p_149727_7_, float p_149727_8_, float p_149727_9_) {
+    public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int side, float subX,
+            float subY, float subZ) {
         AbstractInvExpander expander = (AbstractInvExpander) world.getTileEntity(x, y, z);
         TurretBase base = expander.getBase();
         if (base != null && base.getTrustedPlayer(player.getUniqueID()) != null) {

src/main/java/openmodularturrets/blocks/expanders/BlockExpanderInvTierFour.java

@@ -29,14 +29,14 @@ public BlockExpanderInvTierFour() {
     }
 
     @Override
-    public void registerBlockIcons(IIconRegister p_149651_1_) {
-        super.registerBlockIcons(p_149651_1_);
-        blockIcon = p_149651_1_.registerIcon(ModInfo.ID.toLowerCase() + ":expanderInvTierFour");
+    public void registerBlockIcons(IIconRegister reg) {
+        super.registerBlockIcons(reg);
+        blockIcon = reg.registerIcon(ModInfo.ID.toLowerCase() + ":expanderInvTierFour");
     }
 
     @Override
-    public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int p_149727_6_,
-            float p_149727_7_, float p_149727_8_, float p_149727_9_) {
+    public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int side, float subX,
+            float subY, float subZ) {
         AbstractInvExpander expander = (AbstractInvExpander) world.getTileEntity(x, y, z);
         TurretBase base = expander.getBase();
         if (base != null && base.getTrustedPlayer(player.getUniqueID()) != null) {

src/main/java/openmodularturrets/blocks/expanders/BlockExpanderInvTierOne.java

@@ -29,14 +29,14 @@ public BlockExpanderInvTierOne() {
     }
 
     @Override
-    public void registerBlockIcons(IIconRegister p_149651_1_) {
-        super.registerBlockIcons(p_149651_1_);
-        blockIcon = p_149651_1_.registerIcon(ModInfo.ID.toLowerCase() + ":expanderInvTierOne");
+    public void registerBlockIcons(IIconRegister reg) {
+        super.registerBlockIcons(reg);
+        blockIcon = reg.registerIcon(ModInfo.ID.toLowerCase() + ":expanderInvTierOne");
     }
 
     @Override
-    public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int p_149727_6_,
-            float p_149727_7_, float p_149727_8_, float p_149727_9_) {
+    public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int side, float subX,
+            float subY, float subZ) {
         AbstractInvExpander expander = (AbstractInvExpander) world.getTileEntity(x, y, z);
         TurretBase base = expander.getBase();
         if (base != null && base.getTrustedPlayer(player.getUniqueID()) != null) {

src/main/java/openmodularturrets/blocks/expanders/BlockExpanderInvTierThree.java

@@ -29,14 +29,14 @@ public BlockExpanderInvTierThree() {
     }
 
     @Override
-    public void registerBlockIcons(IIconRegister p_149651_1_) {
-        super.registerBlockIcons(p_149651_1_);
-        blockIcon = p_149651_1_.registerIcon(ModInfo.ID.toLowerCase() + ":expanderInvTierThree");
+    public void registerBlockIcons(IIconRegister reg) {
+        super.registerBlockIcons(reg);
+        blockIcon = reg.registerIcon(ModInfo.ID.toLowerCase() + ":expanderInvTierThree");
     }
 
     @Override
-    public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int p_149727_6_,
-            float p_149727_7_, float p_149727_8_, float p_149727_9_) {
+    public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int side, float subX,
+            float subY, float subZ) {
         AbstractInvExpander expander = (AbstractInvExpander) world.getTileEntity(x, y, z);
         TurretBase base = expander.getBase();
         if (base != null && base.getTrustedPlayer(player.getUniqueID()) != null) {

src/main/java/openmodularturrets/blocks/expanders/BlockExpanderInvTierTwo.java

@@ -29,14 +29,14 @@ public BlockExpanderInvTierTwo() {
     }
 
     @Override
-    public void registerBlockIcons(IIconRegister p_149651_1_) {
-        super.registerBlockIcons(p_149651_1_);
-        blockIcon = p_149651_1_.registerIcon(ModInfo.ID.toLowerCase() + ":expanderInvTierTwo");
+    public void registerBlockIcons(IIconRegister reg) {
+        super.registerBlockIcons(reg);
+        blockIcon = reg.registerIcon(ModInfo.ID.toLowerCase() + ":expanderInvTierTwo");
     }
 
     @Override
-    public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int p_149727_6_,
-            float p_149727_7_, float p_149727_8_, float p_149727_9_) {
+    public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int side, float subX,
+            float subY, float subZ) {
         AbstractInvExpander expander = (AbstractInvExpander) world.getTileEntity(x, y, z);
         TurretBase base = expander.getBase();
         if (base != null && base.getTrustedPlayer(player.getUniqueID()) != null) {

src/main/java/openmodularturrets/blocks/expanders/BlockExpanderPowerTierFive.java

@@ -25,9 +25,9 @@ public BlockExpanderPowerTierFive() {
     }
 
     @Override
-    public void registerBlockIcons(IIconRegister p_149651_1_) {
-        super.registerBlockIcons(p_149651_1_);
-        blockIcon = p_149651_1_.registerIcon(ModInfo.ID.toLowerCase() + ":expanderPowerTierFive");
+    public void registerBlockIcons(IIconRegister reg) {
+        super.registerBlockIcons(reg);
+        blockIcon = reg.registerIcon(ModInfo.ID.toLowerCase() + ":expanderPowerTierFive");
     }
 
     @Override

src/main/java/openmodularturrets/blocks/expanders/BlockExpanderPowerTierFour.java

@@ -25,9 +25,9 @@ public BlockExpanderPowerTierFour() {
     }
 
     @Override
-    public void registerBlockIcons(IIconRegister p_149651_1_) {
-        super.registerBlockIcons(p_149651_1_);
-        blockIcon = p_149651_1_.registerIcon(ModInfo.ID.toLowerCase() + ":expanderPowerTierFour");
+    public void registerBlockIcons(IIconRegister reg) {
+        super.registerBlockIcons(reg);
+        blockIcon = reg.registerIcon(ModInfo.ID.toLowerCase() + ":expanderPowerTierFour");
     }
 
     @Override

src/main/java/openmodularturrets/blocks/expanders/BlockExpanderPowerTierOne.java

@@ -25,9 +25,9 @@ public BlockExpanderPowerTierOne() {
     }
 
     @Override
-    public void registerBlockIcons(IIconRegister p_149651_1_) {
-        super.registerBlockIcons(p_149651_1_);
-        blockIcon = p_149651_1_.registerIcon(ModInfo.ID.toLowerCase() + ":expanderPowerTierOne");
+    public void registerBlockIcons(IIconRegister reg) {
+        super.registerBlockIcons(reg);
+        blockIcon = reg.registerIcon(ModInfo.ID.toLowerCase() + ":expanderPowerTierOne");
     }
 
     @Override

src/main/java/openmodularturrets/blocks/expanders/BlockExpanderPowerTierThree.java

@@ -25,9 +25,9 @@ public BlockExpanderPowerTierThree() {
     }
 
     @Override
-    public void registerBlockIcons(IIconRegister p_149651_1_) {
-        super.registerBlockIcons(p_149651_1_);
-        blockIcon = p_149651_1_.registerIcon(ModInfo.ID.toLowerCase() + ":expanderPowerTierThree");
+    public void registerBlockIcons(IIconRegister reg) {
+        super.registerBlockIcons(reg);
+        blockIcon = reg.registerIcon(ModInfo.ID.toLowerCase() + ":expanderPowerTierThree");
     }
 
     @Override

src/main/java/openmodularturrets/blocks/expanders/BlockExpanderPowerTierTwo.java

@@ -25,9 +25,9 @@ public BlockExpanderPowerTierTwo() {
     }
 
     @Override
-    public void registerBlockIcons(IIconRegister p_149651_1_) {
-        super.registerBlockIcons(p_149651_1_);
-        blockIcon = p_149651_1_.registerIcon(ModInfo.ID.toLowerCase() + ":expanderPowerTierTwo");
+    public void registerBlockIcons(IIconRegister reg) {
+        super.registerBlockIcons(reg);
+        blockIcon = reg.registerIcon(ModInfo.ID.toLowerCase() + ":expanderPowerTierTwo");
     }
 
     @Override

src/main/java/openmodularturrets/blocks/misc/BlockFenceTierFive.java

@@ -30,19 +30,18 @@ public BlockFenceTierFive() {
     }
 
     @Override
-    public void registerBlockIcons(IIconRegister p_149651_1_) {
-        super.registerBlockIcons(p_149651_1_);
-        blockIcon = p_149651_1_.registerIcon(ModInfo.ID.toLowerCase() + ":fenceTierFive");
+    public void registerBlockIcons(IIconRegister reg) {
+        super.registerBlockIcons(reg);
+        blockIcon = reg.registerIcon(ModInfo.ID.toLowerCase() + ":fenceTierFive");
     }
 
     @Override
-    public void onEntityCollidedWithBlock(World p_149670_1_, int p_149670_2_, int p_149670_3_, int p_149670_4_,
-            Entity p_149670_5_) {
-        if (!(p_149670_5_ instanceof EntityItem)) p_149670_5_.attackEntityFrom(DamageSource.cactus, 5);
+    public void onEntityCollidedWithBlock(World worldIn, int x, int y, int z, Entity entityIn) {
+        if (!(entityIn instanceof EntityItem)) entityIn.attackEntityFrom(DamageSource.cactus, 5);
     }
 
     @Override
-    public Item getItemDropped(int p_149650_1_, Random p_149650_2_, int p_149650_3_) {
+    public Item getItemDropped(int meta, Random random, int fortune) {
 
         return Item.getItemFromBlock(Blocks.fenceTierFive);
     }

src/main/java/openmodularturrets/blocks/misc/BlockFenceTierFour.java

@@ -30,19 +30,18 @@ public BlockFenceTierFour() {
     }
 
     @Override
-    public void registerBlockIcons(IIconRegister p_149651_1_) {
-        super.registerBlockIcons(p_149651_1_);
-        blockIcon = p_149651_1_.registerIcon(ModInfo.ID.toLowerCase() + ":fenceTierFour");
+    public void registerBlockIcons(IIconRegister reg) {
+        super.registerBlockIcons(reg);
+        blockIcon = reg.registerIcon(ModInfo.ID.toLowerCase() + ":fenceTierFour");
     }
 
     @Override
-    public void onEntityCollidedWithBlock(World p_149670_1_, int p_149670_2_, int p_149670_3_, int p_149670_4_,
-            Entity p_149670_5_) {
-        if (!(p_149670_5_ instanceof EntityItem)) p_149670_5_.attackEntityFrom(DamageSource.cactus, 4);
+    public void onEntityCollidedWithBlock(World worldIn, int x, int y, int z, Entity entityIn) {
+        if (!(entityIn instanceof EntityItem)) entityIn.attackEntityFrom(DamageSource.cactus, 4);
     }
 
     @Override
-    public Item getItemDropped(int p_149650_1_, Random p_149650_2_, int p_149650_3_) {
+    public Item getItemDropped(int meta, Random random, int fortune) {
         return Item.getItemFromBlock(Blocks.fenceTierFour);
     }
 }

src/main/java/openmodularturrets/blocks/misc/BlockFenceTierOne.java

@@ -26,13 +26,13 @@ public BlockFenceTierOne() {
     }
 
     @Override
-    public void registerBlockIcons(IIconRegister p_149651_1_) {
-        super.registerBlockIcons(p_149651_1_);
-        blockIcon = p_149651_1_.registerIcon(ModInfo.ID.toLowerCase() + ":fenceTierOne");
+    public void registerBlockIcons(IIconRegister reg) {
+        super.registerBlockIcons(reg);
+        blockIcon = reg.registerIcon(ModInfo.ID.toLowerCase() + ":fenceTierOne");
     }
 
     @Override
-    public Item getItemDropped(int p_149650_1_, Random p_149650_2_, int p_149650_3_) {
+    public Item getItemDropped(int meta, Random random, int fortune) {
         return Item.getItemFromBlock(Blocks.fenceTierOne);
     }
 }

src/main/java/openmodularturrets/blocks/misc/BlockFenceTierThree.java

@@ -30,19 +30,18 @@ public BlockFenceTierThree() {
     }
 
     @Override
-    public void registerBlockIcons(IIconRegister p_149651_1_) {
-        super.registerBlockIcons(p_149651_1_);
-        blockIcon = p_149651_1_.registerIcon(ModInfo.ID.toLowerCase() + ":fenceTierThree");
+    public void registerBlockIcons(IIconRegister reg) {
+        super.registerBlockIcons(reg);
+        blockIcon = reg.registerIcon(ModInfo.ID.toLowerCase() + ":fenceTierThree");
     }
 
     @Override
-    public void onEntityCollidedWithBlock(World p_149670_1_, int p_149670_2_, int p_149670_3_, int p_149670_4_,
-            Entity p_149670_5_) {
-        if (!(p_149670_5_ instanceof EntityItem)) p_149670_5_.attackEntityFrom(DamageSource.cactus, 3);
+    public void onEntityCollidedWithBlock(World worldIn, int x, int y, int z, Entity entityIn) {
+        if (!(entityIn instanceof EntityItem)) entityIn.attackEntityFrom(DamageSource.cactus, 3);
     }
 
     @Override
-    public Item getItemDropped(int p_149650_1_, Random p_149650_2_, int p_149650_3_) {
+    public Item getItemDropped(int meta, Random random, int fortune) {
         return Item.getItemFromBlock(Blocks.fenceTierThree);
     }
 }