Merge pull request #243 from RedstoneTools/dev

Update to 1.2.0

.github/workflows/gradle.yml

@@ -1,31 +1,54 @@
-# This workflow uses actions that are not certified by GitHub.
-# They are provided by a third-party and are governed by
-# separate terms of service, privacy policy, and support
-# documentation.
-# This workflow will build a Java project with Gradle and cache/restore any dependencies to improve the workflow execution time
-# For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-java-with-gradle
+# Build Workflow
 
-name: Java CI with Gradle
+name: Build & test
 
 on:
   pull_request:
-    branches: ['main']
+
+concurrency:
+  group: ${{ github.head_ref || format('{0}-{1}', github.ref, github.run_number) }}
+  cancel-in-progress: true
 
 permissions:
   contents: read
 
 jobs:
   build:
+    name: Build
+
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v3
+      - name: Checkout
+        uses: actions/checkout@v3
+        with:
+          fetch-depth: 10
+
       - name: Set up JDK 17
         uses: actions/setup-java@v3
         with:
-          java-version: '17'
-          distribution: 'adopt'
-      - name: Build with Gradle and run tests
-        uses: gradle/gradle-build-action@67421db6bd0bf253fb4bd25b31ebb98943c375e1
+          java-version: 17
+          distribution: temurin
+
+      - uses: actions/cache@v3
+        with:
+          path: |
+            ~/.gradle/caches
+            ~/.gradle/wrapper
+            **/loom-cache
+            **/prebundled-jars
+          key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
+          restore-keys: |
+            ${{ runner.os }}-gradle-
+
+      - name: Chmod Gradle
+        run: chmod +x ./gradlew
+
+      - name: Build
+        run: ./gradlew build --no-daemon
+
+      - name: Upload Build Artifacts
+        uses: actions/upload-artifact@v3
         with:
-          arguments: test
+          name: dev-artifacts
+          path: build/libs/

build.gradle

@@ -1,3 +1,5 @@
+//file:noinspection GroovyAssignabilityCheck
+
 plugins {
 	id 'fabric-loom' version '1.2-SNAPSHOT'
 	id 'maven-publish'
@@ -21,15 +23,19 @@ repositories {
         name = "WorldEdit Maven"
         url = "https://maven.enginehub.org/repo/"
     }
+	maven {
+		name = "JitPack"
+		url = "https://jitpack.io"
+	}
 }
 
 dependencies {
-	// Guice + dependencies
-	include implementation("com.google.inject:guice:5.0.1")
-	include "aopalliance:aopalliance:1.0"
-	include "javax.inject:javax.inject:1"
-	include "javax.json:javax.json-api:1.1.4"
-	include "jakarta.inject:jakarta.inject-api:2.0.1"
+	// Doctor (dependency-injection)
+	include implementation("rip.hippo:Doctor:1.0.1")
+	include implementation("javax.inject:javax.inject:1")
+
+	// Json
+	include implementation("javax.json:javax.json-api:1.1.4")
 	include "org.glassfish:javax.json:1.1.4"
 
 	// AutoService

gradle.properties

@@ -9,7 +9,7 @@ org.gradle.parallel=true
 	loader_version=0.14.6
 
 # Mod Properties
-	mod_version = 1.18.2-1.1.4
+	mod_version = 1.18.2-1.2.0
 	maven_group = tools.redstone
 	archives_base_name = redstonetools
 

src/main/java/tools/redstone/redstonetools/RedstoneToolsClient.java

@@ -1,19 +1,19 @@
 package tools.redstone.redstonetools;
 
-import com.google.inject.Guice;
-import com.google.inject.Injector;
 import net.fabricmc.api.ClientModInitializer;
 import net.fabricmc.loader.api.FabricLoader;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import rip.hippo.inject.Doctor;
+import rip.hippo.inject.Injector;
 import tools.redstone.redstonetools.macros.WorldlessCommandHelper;
 import tools.redstone.redstonetools.utils.ReflectionUtils;
 
 public class RedstoneToolsClient implements ClientModInitializer {
     public static final String MOD_ID = "redstonetools";
     public static final String MOD_VERSION = "v" + FabricLoader.getInstance().getModContainer(MOD_ID).orElseThrow().getMetadata().getVersion().getFriendlyString();
     public static final Logger LOGGER = LoggerFactory.getLogger(MOD_ID);
-    public static final Injector INJECTOR = Guice.createInjector(ReflectionUtils.getModules());
+    public static final Injector INJECTOR = Doctor.createInjector(ReflectionUtils.getModules());
 
     @Override
     public void onInitializeClient() {

src/main/java/tools/redstone/redstonetools/di/FeatureModule.java

@@ -1,17 +1,18 @@
 package tools.redstone.redstonetools.di;
 
 import com.google.auto.service.AutoService;
-import com.google.inject.AbstractModule;
+import rip.hippo.inject.DoctorModule;
+import rip.hippo.inject.binding.Binder;
 import tools.redstone.redstonetools.utils.ReflectionUtils;
 
-@AutoService(AbstractModule.class)
-public class FeatureModule extends AbstractModule {
+@AutoService(DoctorModule.class)
+public class FeatureModule implements DoctorModule {
     @SuppressWarnings({"rawtypes", "unchecked"}) // this is probably the only way to make it work
     @Override
-    protected void configure() {
+    public void configure(Binder binder) {
         for (var feature : ReflectionUtils.getFeatures()) {
             Class clazz = feature.getClass();
-            bind(clazz).toInstance(feature);
+            binder.bind(clazz).toInstance(feature);
         }
     }
 }

src/main/java/tools/redstone/redstonetools/di/UtilityModule.java

@@ -1,14 +1,15 @@
 package tools.redstone.redstonetools.di;
 
 import com.google.auto.service.AutoService;
+import rip.hippo.inject.DoctorModule;
+import rip.hippo.inject.binding.Binder;
 import tools.redstone.redstonetools.features.feedback.AbstractFeedbackSender;
 import tools.redstone.redstonetools.features.feedback.FeedbackSender;
-import com.google.inject.AbstractModule;
 
-@AutoService(AbstractModule.class)
-public class UtilityModule extends AbstractModule {
+@AutoService(DoctorModule.class)
+public class UtilityModule implements DoctorModule {
     @Override
-    protected void configure() {
-        bind(AbstractFeedbackSender.class).to(FeedbackSender.class).asEagerSingleton();
+    public void configure(Binder binder) {
+        binder.bind(AbstractFeedbackSender.class).to(FeedbackSender.class);
     }
 }

src/main/java/tools/redstone/redstonetools/features/commands/BinaryBlockReadFeature.java

@@ -13,6 +13,9 @@
 import net.minecraft.command.argument.BlockStateArgument;
 import net.minecraft.server.command.ServerCommandSource;
 import net.minecraft.util.math.BlockPos;
+
+import java.util.Collections;
+
 import static tools.redstone.redstonetools.features.arguments.serializers.BlockStateArgumentSerializer.blockState;
 import static tools.redstone.redstonetools.features.arguments.serializers.BoolSerializer.bool;
 import static tools.redstone.redstonetools.features.arguments.serializers.IntegerSerializer.integer;
@@ -22,7 +25,9 @@
 @Feature(name = "Binary Block Read", description = "Interprets your WorldEdit selection as a binary number.", command = "/read")
 public class BinaryBlockReadFeature extends CommandFeature {
     private static final BlockStateArgument LIT_LAMP_ARG = new BlockStateArgument(
-            Blocks.REDSTONE_LAMP.getDefaultState().with(RedstoneLampBlock.LIT, true), null, null
+            Blocks.REDSTONE_LAMP.getDefaultState().with(RedstoneLampBlock.LIT, true),
+            Collections.singleton(RedstoneLampBlock.LIT),
+            null
     );
 
     public static final Argument<Integer> offset = Argument
@@ -70,13 +75,15 @@ protected Feedback execute(ServerCommandSource source) throws CommandSyntaxExcep
             var pos = new BlockPos(point.getBlockX(), point.getBlockY(), point.getBlockZ());
             var actualState = source.getWorld().getBlockState(pos);
 
-            var matches = true;
-            for (var property : onBlock.getValue().getProperties()) {
-                var propertyValue = onBlock.getValue().getBlockState().get(property);
+            var matches = actualState.getBlock() == onBlock.getValue().getBlockState().getBlock();
+            if (matches) {
+                for (var property : onBlock.getValue().getProperties()) {
+                    var propertyValue = onBlock.getValue().getBlockState().get(property);
 
-                if (!actualState.get(property).equals(propertyValue)) {
-                    matches = false;
-                    break;
+                    if (!actualState.get(property).equals(propertyValue)) {
+                        matches = false;
+                        break;
+                    }
                 }
             }
 

src/main/java/tools/redstone/redstonetools/features/commands/CopyStateFeature.java

@@ -26,7 +26,7 @@ protected Either<ItemStack, Feedback> getItemStack(ServerCommandSource source, B
         ItemStack itemStack = blockInfo.block.getPickStack(client.world, blockInfo.pos, blockInfo.state);
 
         if (blockInfo.state.hasBlockEntity()) {
-            ((MinecraftClientAccessor) client).addBlockEntityNbt(itemStack, blockInfo.entity);
+            ((MinecraftClientAccessor) client).invokeAddBlockEntityNbt(itemStack, blockInfo.entity);
         }
 
         int i = addBlockStateNbt(itemStack, blockInfo.state);

src/main/java/tools/redstone/redstonetools/features/feedback/FeedbackSender.java

@@ -3,6 +3,9 @@
 import net.minecraft.server.command.ServerCommandSource;
 import net.minecraft.text.LiteralText;
 
+import javax.inject.Singleton;
+
+@Singleton
 public class FeedbackSender extends AbstractFeedbackSender {
     @Override
     public void sendFeedback(ServerCommandSource source, Feedback feedback) {

src/main/java/tools/redstone/redstonetools/macros/MacroManager.java

@@ -1,10 +1,11 @@
 package tools.redstone.redstonetools.macros;
 
-import tools.redstone.redstonetools.macros.actions.Action;
-import tools.redstone.redstonetools.macros.actions.CommandAction;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.util.InputUtil;
+import tools.redstone.redstonetools.macros.actions.Action;
+import tools.redstone.redstonetools.macros.actions.CommandAction;
 
+import javax.inject.Singleton;
 import javax.json.Json;
 import javax.json.JsonArray;
 import javax.json.JsonObject;
@@ -16,6 +17,7 @@
 import java.util.ArrayList;
 import java.util.List;
 
+@Singleton
 public class MacroManager {
     private final Path macrosFilePath;
     private final List<Macro> macros;

src/main/java/tools/redstone/redstonetools/mixin/accessors/MinecraftClientAccessor.java

@@ -8,6 +8,6 @@
 
 @Mixin(MinecraftClient.class)
 public interface MinecraftClientAccessor {
-    @Invoker("addBlockEntityNbt")
-    ItemStack addBlockEntityNbt(ItemStack stack, BlockEntity blockEntity);
+    @Invoker
+    ItemStack invokeAddBlockEntityNbt(ItemStack stack, BlockEntity blockEntity);
 }