added gasVoid sprite

added bundles
Zelaux · Aug 5, 2021 · 0daf787 · 0daf787
1 parent 3f2b42c
commit 0daf787
Show file tree

Hide file tree

Showing 12 changed files with 31 additions and 30 deletions.
diff --git a/core/assets-raw/sprites/gas-void.png b/core/assets-raw/sprites/gas-void.png
diff --git a/core/assets/bundles/bundle.properties b/core/assets/bundles/bundle.properties
@@ -1,4 +1,9 @@
-block.gas-lib-java-gas-source.name = Gas Source
-block.gas-lib-java-gas-source.description = Infinitely outputs gasses. Sandbox only.
-block.gas-lib-java-gas-void.name = Gas Void
-block.gas-lib-java-gas-void.description = Removes any liquids. Sandbox only.
+
+block.gas-library-java-gas-source.name = Gas Source
+block.gas-library-java-gas-source.description = Infinitely outputs gasses. Sandbox only.
+block.gas-library-java-gas-void.name = Gas Void
+block.gas-library-java-gas-void.description = Removes any gasses. Sandbox only.
+category.gasses = Gasses
+bar.gas=Gas
+stat.gascapacity = Gas capacity
+content.typeid_UNUSED.name=Gasses
diff --git a/core/assets/bundles/bundle_ru.properties b/core/assets/bundles/bundle_ru.properties
@@ -1,4 +1,9 @@
-block.gas-lib-java-gas-source.name = Èñòî÷íèê ãàçîâ
-block.gas-lib-java-gas-source.description = Ïîñòîÿííî âûäà¸ò ãàç. Òîëüêî ïåñî÷íèöà.
-block.gas-lib-java-gas-void.name = Ãàçîâûé âàêóóì
-block.gas-lib-java-gas-void.description = Óíè÷òîæàåò ëþáûå æèäêîñòè. Òîëüêî ïåñî÷íèöà.
+
+block.gas-library-java-gas-source.name = Источник газов
+block.gas-library-java-gas-source.description = Постоянно выдаёт газ. Только песочница.
+block.gas-library-java-gas-void.name = Газовый вакуум
+block.gas-library-java-gas-void.description = Уничтожает любые газы. Только песочница.
+bar.gas = Газ
+category.gasses = Газы
+stat.gascapacity = Объём газа
+content.typeid_UNUSED.name=Газы
diff --git a/core/assets/sprites/editor/gas-void-icon-editor.png b/core/assets/sprites/editor/gas-void-icon-editor.png
diff --git a/core/assets/sprites/gas-void.png b/core/assets/sprites/gas-void.png
diff --git a/core/assets/sprites/generated/gas-void-icon-logic.png b/core/assets/sprites/generated/gas-void-icon-logic.png
diff --git a/core/assets/sprites/ui/block-gas-void-ui.png b/core/assets/sprites/ui/block-gas-void-ui.png
diff --git a/core/src/example/ExampleClass.java b/core/src/example/ExampleClass.java
diff --git a/core/src/gas/GasStack.java b/core/src/gas/GasStack.java
@@ -11,7 +11,11 @@ public GasStack(Gas gas, float amount) {
         this.gas = gas;
         this.amount = amount;
     }
-
+/*block.gas-library-java-gas-source.name = Источник газов
+block.gas-library-java-gas-source.description = Постоянно выдаёт газ. Только песочница.
+block.gas-library-java-gas-void.name = Газовый вакуум
+    block.gas-library-java-gas-void.description = Уничтожает любые газы. Только песочница.
+*/
     protected GasStack() {
         gas = null;
     }

diff --git a/core/src/gas/content/GasBlocks.java b/core/src/gas/content/GasBlocks.java
@@ -18,14 +18,14 @@ public class GasBlocks implements ContentList {
 
     public void load() {
         gasSource = new GasSource("gas-source") {{
-            localizedName = "Gas Source";
-            description = "Infinitely outputs gasses. Sandbox only.";
+//            localizedName = "Gas Source";
+//            description = "Infinitely outputs gasses. Sandbox only.";
             requirements(Category.liquid, BuildVisibility.sandboxOnly, with());
             alwaysUnlocked = true;
         }};
         gasVoid = new GasVoid("gas-void") {{
-            localizedName = "Gas Void";
-            description = "Removes any liquids. Sandbox only.";
+//            localizedName = "Gas Void";
+//            description = "Removes any liquids. Sandbox only.";
             requirements(Category.liquid, BuildVisibility.sandboxOnly, with());
             alwaysUnlocked = true;
         }};

diff --git a/core/src/gas/world/GasBlock.java b/core/src/gas/world/GasBlock.java
@@ -78,9 +78,9 @@ public void getDependencies(Cons<UnlockableContent> cons) {
 
     @Override
     public void init() {
-        localizedName = Core.bundle.get(getContentType() + "." + this.name + ".name", localizedName);
-        description = Core.bundle.get(getContentType() + "." + this.name + ".description",description);
-        details = Core.bundle.get(getContentType() + "." + this.name + ".details",details);
+//        localizedName = Core.bundle.get(getContentType() + "." + this.name + ".name", localizedName);
+//        description = Core.bundle.get(getContentType() + "." + this.name + ".description",description);
+//        details = Core.bundle.get(getContentType() + "." + this.name + ".details",details);
         super.init();
         for (ConsumeType value : ConsumeType.values()) {
             if (consumes.has(value)) {

diff --git a/mod.hjson b/mod.hjson
@@ -3,6 +3,6 @@ displayName: "GasLibrary"
 author: "Zelaux"
 description: "Java library for java mods"
 main: "gas.GasLibMod"
-version: 1.3
+version: 1.4
 minGameVersion: 129.2
 dependencies: ["advanced-content-info"]