Updated examples, version bump

Srdjan-V · Oct 16, 2022 · 691decf · 691decf
1 parent a8bb26b
commit 691decf
Show file tree

Hide file tree

Showing 5 changed files with 44 additions and 50 deletions.
diff --git a/examples/basic.zs b/examples/basic.zs
diff --git a/examples/drainChance.zs b/examples/drainChance.zs
diff --git a/examples/examples.zs b/examples/examples.zs
@@ -0,0 +1,37 @@
+import mods.TweakedPetroleum.TweakedReservoir;
+import mods.TweakedPetroleum.TweakedGasReservoir;
+import mods.TweakedLib.TweakedPowerTier;
+
+/*
+    TweakedReservoir.registerReservoir(String name, ILiquidStack fluid, int minSize, int maxSize, int replenishRate, int pumpSpeed, int weight, int powerTier,
+                                        @Optional int[] dimBlacklist, @Optional int[] dimWhitelist, @Optional String[] biomeBlacklist, @Optional String[] biomeWhitelist)
+
+    TweakedPowerTier.registerPowerTier(int capacity, int rft)
+*/
+
+    var powerTier = TweakedPowerTier.registerPowerTier(16000, 1024);
+    var powerTier2 = TweakedPowerTier.registerPowerTier(160000, 10240);
+
+
+/*
+TweakedGasReservoir.registerGasReservoir(String name, IGasStack gas, int minSize, int maxSize, int replenishRate, int pumpSpeed, int weight, int powerTier,
+                                             @Optional int[] dimBlacklist, @Optional int[] dimWhitelist, @Optional String[] biomeBlacklist, @Optional String[] biomeWhitelist)
+*/
+
+    TweakedGasReservoir.registerGasReservoir("Hydrogen Gas", <gas:hydrogen>, 2500000, 15000000, 150, 350, 40, powerTier,
+        [], [0]);
+
+    TweakedGasReservoir.registerGasReservoir("Ethylene Gas", <gas:ethene>, 2500000, 15000000, 200, 450, 50, powerTier,
+        [], [0, -1], [], []);
+
+    TweakedGasReservoir.registerGasReservoir("Osmium Slurry", <gas:osmium>, 2500000, 15000000, 150, 250, 30, powerTier,
+        [], [0, 1], []);
+
+
+/*
+    TweakedGasReservoir.registerGasReservoirWithDrainChance(String name, IGasStack gas, int minSize, int maxSize, int replenishRate, int pumpSpeed, float drainChance, int weight, int powerTier,
+    int[] dimBlacklist, int[] dimWhitelist, String[] biomeBlacklist, String[] biomeWhitelist)
+*/
+
+    TweakedGasReservoir.registerGasReservoirWithDrainChance("Osmium Slurry", <gas:osmium>, 2500000, 15000000, 6, 25, 0.5, 40, powerTier2,
+        [], [0], [], []);
diff --git a/gradle.properties b/gradle.properties
@@ -5,10 +5,10 @@ org.gradle.daemon = false
 
 
 # Mod Information
-tweaked_petroleum_version = 1.2.8
-tweaked_lib_version = 0.1.20
+tweaked_petroleum_version = 1.3.0
+tweaked_lib_version = 1.0.0
 
-mod_version = 1.0.3
+mod_version = 1.1.0
 maven_group = srki2k
 archives_base_name = tweakedpetroleumgas
 

diff --git a/src/main/java/srki2k/tweakedpetroleumgas/common/compat/crafttweaker/TweakedGasReservoir.java b/src/main/java/srki2k/tweakedpetroleumgas/common/compat/crafttweaker/TweakedGasReservoir.java
@@ -7,19 +7,21 @@
 import srki2k.tweakedpetroleum.api.crafting.TweakedPumpjackHandler;
 import srki2k.tweakedpetroleum.api.ihelpers.IReservoirType;
 import srki2k.tweakedpetroleum.util.ReservoirValidation;
+import stanhebben.zenscript.annotations.Optional;
 import stanhebben.zenscript.annotations.ZenClass;
 import stanhebben.zenscript.annotations.ZenMethod;
 
 import java.util.ArrayList;
 import java.util.List;
 
+@SuppressWarnings("unused")
 @ZenClass("mods.TweakedPetroleum.TweakedGasReservoir")
 @ZenRegister
 public class TweakedGasReservoir {
 
     @ZenMethod
     public static void registerGasReservoir(String name, IGasStack gas, int minSize, int maxSize, int replenishRate, int pumpSpeed, int weight, int powerTier,
-                                            int[] dimBlacklist, int[] dimWhitelist, String[] biomeBlacklist, String[] biomeWhitelist) {
+                                            @Optional int[] dimBlacklist, @Optional int[] dimWhitelist, @Optional String[] biomeBlacklist, @Optional String[] biomeWhitelist) {
 
 
         List<String> biomeBlacklistList = new ArrayList<>();
@@ -44,7 +46,7 @@ public static void registerGasReservoir(String name, IGasStack gas, int minSize,
 
     @ZenMethod
     public static void registerGasReservoirWithDrainChance(String name, IGasStack gas, int minSize, int maxSize, int replenishRate, int pumpSpeed, float drainChance, int weight, int powerTier,
-                                                       int[] dimBlacklist, int[] dimWhitelist, String[] biomeBlacklist, String[] biomeWhitelist) {
+                                                           @Optional int[] dimBlacklist, @Optional int[] dimWhitelist, @Optional String[] biomeBlacklist, @Optional String[] biomeWhitelist) {
 
         List<String> biomeBlacklistList = new ArrayList<>();
         List<String> biomeWhitelistList = new ArrayList<>();