+fluid block mode for in world fluid

bioastroiner · Sep 7, 2023 · c704eb3 · c704eb3
1 parent 4539294
commit c704eb3
Show file tree

Hide file tree

Showing 3 changed files with 425 additions and 331 deletions.
diff --git a/dependencies.gradle b/dependencies.gradle
@@ -45,10 +45,11 @@ dependencies {
     //compileOnly "cofh:CoFHLib:1.7.10R3.0.3:dev"
     //compileOnly "maven.modrinth:baubles-expanded:2.1.4"
     //compileOnly fileTree("libs/Techguns.beta.1.2_alphatest4.1.jar")
-    //api("com.github.GTNewHorizons:ModularUI2:2.0.6-1.7.10:dev")
-//    compile "micdoodle8.mods:MicdoodleCore:1.7-3.0.12.504:Dev"
-//    compile "micdoodle8.mods:GalacticraftCore:1.7-3.0.12.504:Dev"
-//    api "micdoodle8.mods:Galacticraft-Planets:1.7-3.0.12.504:Dev"
+    //api("com.github.GTNewHorizons:ModularUI2:2.0.6-1.7.10:dev"
+    compileOnly "micdoodle8.mods:MicdoodleCore:1.7-3.0.12.504:Dev"
+    compileOnly "micdoodle8.mods:GalacticraftCore:1.7-3.0.12.504:Dev"
+    compileOnly "micdoodle8.mods:Galacticraft-Planets:1.7-3.0.12.504:Dev"
+    compileOnly "ic2:IC2Classic:1.2.1.8:dev"
 //    api "codechicken:CodeChickenLib:1.7.10-1.1.3.140:dev"
 //    api "codechicken:CodeChickenCore:1.7.10-1.0.7.47:dev"
     //api 'com.github.GTNewHorizons:CodeChickenLib:1.1.8:dev'

diff --git a/src/main/java/bioast/mods/gt6scan/item/ScanMode.java b/src/main/java/bioast/mods/gt6scan/item/ScanMode.java
@@ -3,7 +3,7 @@
 import gregapi.oredict.OreDictPrefix;
 
 enum ScanMode {
-    LARGE(gregapi.data.OP.ore), SMALL(gregapi.data.OP.oreSmall), DENSE_AND_NORMAL(gregapi.data.OP.oreDense), BEDROCK(gregapi.data.OP.oreBedrock), FLUID(gregapi.data.OP.bucket), ROCK(gregapi.data.OP.rockGt);
+    LARGE(gregapi.data.OP.ore), SMALL(gregapi.data.OP.oreSmall), DENSE_AND_NORMAL(gregapi.data.OP.oreDense), BEDROCK(gregapi.data.OP.oreBedrock), FLUID_BEDROCK(gregapi.data.OP.bucket), ROCK(gregapi.data.OP.rockGt),FLUID(gregapi.data.OP.bucket);
     public final OreDictPrefix OP;
 
     ScanMode(OreDictPrefix op) {
@@ -24,12 +24,15 @@ public boolean isTE() {
             case BEDROCK -> {
                 return true;
             }
-            case FLUID -> {
+            case FLUID_BEDROCK -> {
                 return true;
             }
             case ROCK -> {
                 return true;
             }
+            case FLUID -> {
+                return false;
+            }
             default -> throw new IllegalStateException("Unexpected value: " + this);
         }
     }