V2 B35

assets/bundles/bundle.properties

@@ -4,13 +4,13 @@ planet.gravillaso-gravillo.details = [orange]The best planet of all planets.
 ###Sectors
 sector.gravillaso-dried-fields.name = Dried Fields
 sector.gravillaso-dried-fields.description = Previously, there was an oil production station here, but by now nothing has survived here. \n\nTry to build and launch an oil generator. \n[red]WARNING: it is strongly recommended to put healing blocks next to the generator!!!
-sector.gravillaso-dried-fields.details = Serpulo-156
+sector.gravillaso-dried-fields.details = Serpulo::156
 sector.gravillaso-logical-center.name = Logical Center
 sector.gravillaso-logical-center.description = You landed in a place that used to be high-tech. There are processors here, but I'm afraid they will no longer be used for their intended purpose. \n\nDefend against enemies approaching from the south.\n\nFirst sector on Gravilo
-sector.gravillaso-logical-center.details = Serpulo-224
+sector.gravillaso-logical-center.details = Serpulo::224
 sector.gravillaso-caustic-gorge.name = Caustic Gorge
 sector.gravillaso-caustic-gorge.description = Huge cave. Some new ores can be mined in this place for example Quartz, a material that can be grind into sand.
-sector.gravillaso-caustic-gorge.details = Gravilo-47
+sector.gravillaso-caustic-gorge.details = Gravilo::47
 ###UI
 @content.planet.name = Planets
 @gravillaso-beta = It's beta version of Gravillaso Mod!
@@ -114,9 +114,9 @@ block.gravillaso-fiery-spray.name = Fiery Spray
 block.gravillaso-fiery-spray.description = Splashes out a jet of any flammable liquid.
 ###Blocks-Factory
 block.gravillaso-advanced-pyratite-mixer.name = Advanced Pyrotite Mixer
-block.gravillaso-advanced-pyratite-mixer.description = [orange]Without description.
+block.gravillaso-advanced-pyratite-mixer.description = Advanced system for mixing.\nCreates pyrotite.
 block.gravillaso-advanced-blast-mixer.name = Advanced Blast Mixer
-block.gravillaso-advanced-blast-mixer.description = [orange]Without description.
+block.gravillaso-advanced-blast-mixer.description = More efficiency system for creating blast compound.
 block.gravillaso-gasoline-barrel.name = Gasoline Barrel
 block.gravillaso-gasoline-barrel.description = Uses oil to distill it into gasoline.
 block.gravillaso-cryofluid-chamber.name = Cryofluid Chamber
@@ -167,6 +167,8 @@ block.gravillaso-advanced-naval-factory.name = Advanced Naval Factory
 block.gravillaso-advanced-naval-factory.description = Produces advanced naval units. Output units can be used directly, or moved into reconstructors for upgrading.
 block.gravillaso-additive-reassembler.name = Additive Reassembler
 block.gravillaso-additive-reassembler.description = Upgrades inputted advanced units to the second tier.
+block.gravillaso-multiplicative-reassembler.name = Multiplicative Reassembler
+block.gravillaso-multiplicative-reassembler.description = Upgrades inputted advanced units to the third tier.
 ###Block-Editor
 block.gravillaso-red-sand.name = Red Sand
 block.gravillaso-red-sand-wall.name = Red Sand Wall

assets/bundles/bundle_ru.properties

@@ -106,9 +106,9 @@ block.gravillaso-fiery-spray.name = Пламенный спрэй
 block.gravillaso-fiery-spray.description = Выплёскивает струю горючей жидкости.
 ###Blocks-Factory
 block.gravillaso-advanced-pyratite-mixer.name = Продвинутая мешалка пиротита
-block.gravillaso-advanced-pyratite-mixer.description = [orange]Описания нету.
+block.gravillaso-advanced-pyratite-mixer.description = Улчучшенная система создания пиротита.
 block.gravillaso-advanced-blast-mixer.name = Продвинутая мешалка взрывной смеси
-block.gravillaso-advanced-blast-mixer.description = [orange]Описания нету.
+block.gravillaso-advanced-blast-mixer.description = Улучшенная система создания взрывчатой смеси.
 block.gravillaso-gasoline-barrel.name = Топливный барель
 block.gravillaso-gasoline-barrel.description = Устройство перегонки нефти в бензин.
 block.gravillaso-cryofluid-chamber.name = Криогенная камера
@@ -157,6 +157,8 @@ block.gravillaso-advanced-naval-factory.name = Продвинутая морск
 block.gravillaso-advanced-naval-factory.description = Производит продвинутые морские единицы. Вывод единиц может быть осуществлён напрямую, либо перенаправлен в реконструкторы для улучшения.
 block.gravillaso-additive-reassembler.name = Добавляющий переспорщик
 block.gravillaso-additive-reassembler.description = Улучшает введённые продвинутые юниты до второго уровня.
+block.gravillaso-multiplicative-reassembler.name = Умножающий пересборщик
+block.gravillaso-multiplicative-reassembler.description = Улучшает введённые продвинутые юниты до третьего уровня.
 ###Block-Editor
 block.gravillaso-red-sand.name = Красный песок
 block.gravillaso-red-sand-wall.name = Стана красного песка

mod.hjson

@@ -3,6 +3,6 @@ name: "gravillaso"
 author: "NiTiS (NickName73)"
 main: "com.NiTiS.Gravillaso.GRMod"
 description: "GRMod"
-version: "2 b34"
+version: "2 b35"
 minGameVersion: 134
 java: true

src/com/NiTiS/Gravillaso/GRMod.java

@@ -2,8 +2,10 @@
 
 import arc.util.Log;
 import com.NiTiS.Gravillaso.content.*;
+import mindustry.Vars;
 import mindustry.ctype.ContentList;
 import mindustry.mod.Mod;
+import mindustry.mod.Mods;
 
 public class GRMod extends Mod {
 
@@ -25,7 +27,8 @@ public static String fullName(String name){
 
     @Override
     public void loadContent() {
-        Log.info("GravillasoR loading");
+        Mods.LoadedMod grmod = Vars.mods.getMod("gravillaso");
+        Log.info("GRavillaso loading");
         int loaded = 0;
         for (ContentList list : required){
             try {

src/com/NiTiS/Gravillaso/content/GRBlocks.java

@@ -14,6 +14,7 @@
 import mindustry.type.LiquidStack;
 import mindustry.type.UnitType;
 import mindustry.world.Block;
+import mindustry.world.blocks.Attributes;
 import mindustry.world.blocks.defense.ForceProjector;
 import mindustry.world.blocks.defense.MendProjector;
 import mindustry.world.blocks.defense.Wall;
@@ -84,6 +85,8 @@ public void load() {
         }};
         redSand = new Floor("red-sand"){{
             wall = redSandWall;
+            attributes.set(Attribute.heat, 0.05f);
+            attributes.set(Attribute.water, -0.05f);
             itemDrop = Items.sand;
             playerUnmineable = true;
         }};
@@ -101,6 +104,9 @@ public void load() {
             status = StatusEffects.melting;
             statusDuration = 247f;
             wall = burningGroundWall;
+            attributes.set(Attribute.heat, 2.75f);
+            attributes.set(Attribute.water, -3);
+            attributes.set(Attribute.oil, 0.25f);
         }};
         burningGroundWall = new StaticWall("burning-ground-wall"){{
             variants = 2;
@@ -364,7 +370,7 @@ public void load() {
             health = 70 * size * size;
             itemCapacity = 240;
             range = 520;
-            rotateSpeed = 0.03f;
+            rotateSpeed = 0.1f;
             translation = 7f;
             minDistribute = 40;
             knockback = 4;
@@ -491,7 +497,7 @@ public void load() {
             inaccuracy = 2;
             range = 180;
             powerUse = 7;
-            shootType = new LaserBulletType(45){{
+            shootType = new LaserBulletType(75){{
                 lifetime = 40;
                 length = 220;
                 width = 10;
@@ -780,6 +786,7 @@ Items.phaseFabric, new ShrapnelBulletType(){{
             );
             consumes.items(with(Items.silicon, 50, Items.graphite, 20, Items.titanium, 30));
             consumes.power(4);
+            constructTime = 60 * 15;
             size = 3;
         }};
         multiplicativeReassembler = new Reconstructor("multiplicative-reassembler"){{
@@ -789,6 +796,7 @@ Items.phaseFabric, new ShrapnelBulletType(){{
             );
             consumes.power(7.5f);
             consumes.items(with(Items.silicon, 140, Items.titanium, 120, GRItems.gravitium, 20));
+            constructTime = 60 * 40;
             size = 5;
         }};
         //endregion

src/com/NiTiS/Gravillaso/content/GRLoadouts.java

@@ -1,6 +1,6 @@
 package com.NiTiS.Gravillaso.content;
 
-import mindustry.content.Loadouts;
+import mindustry.Vars;
 import mindustry.ctype.ContentList;
 import mindustry.game.Schematic;
 import mindustry.game.Schematics;
@@ -14,5 +14,8 @@ public class GRLoadouts implements ContentList {
     public void load() {
         basicMolecular = Schematics.readBase64("bXNjaAF4nDWOQQ7CIBREf6EtRU2MS5ceoDtv4DGMC2x/DAmFhtIm3l7KRBIYIG/mDx3oJKn2ZmJqHiHynY4jL0O0c7LBE1HrzJvdQuL5knRJNhlv16kfgt/4GyKdZ8/rZJId+jFa5+j6iWbLF7OEfgqOh9WZmPnIOe1GZVU4igiIhNSQ5k+JCtx+yMxmaeAqW+RXJbKrQ0YxSBgkDDIjYndVMJfPFj1ahClMU0AUEAVLB7LbU4g0ammU0iivMVGjvN7JH+toI+A=");
         basicColiseum = Schematics.readBase64("bXNjaAF4nD2MXQrCMBCEJz8tNRXEN/EOffQEHkN8iDVIIE1Kmha8vZsumCV8+zMz6HFU0NFODs09ZXdD/3bLmP1cfIoA2mBfLiyQj6fCufhio1+nYUxxc9+UcZqjWydb/Di8sw8Bl0+2GzV2SaQKfnG7PDsKu9KHoKInGYqh//sKyY1mnYaQaNDVleKLYkmzDwTBkAzFIJ9Ay4a2GkTNYOz2rkqAA4FmwymGUwynmHr7Aa+GI0A=");
+
+        Vars.schematics.add(basicMolecular);
+        Vars.schematics.add(basicColiseum);
     }
 }

src/nitis/nickname73/Gravillaso/GravillasoJavaMod.java

@@ -56,7 +56,7 @@ public static String fullName(String name){
     @Override
     public void loadContent(){
         try{
-            LoadedMod mod = mods.locateMod("gravillaso");
+            LoadedMod mod = mods.getMod("gravillaso");
             mod.meta.displayName = "[#51158b]G[#4d2a97]r[#493fa3]a[#4554af]v[#4169bb]i[#3d7ec7]l[#3993d3]l[#35a8df]a[#31bdeb]s[#2dd2f7]o [#e5e5e5]Java";
             mod.meta.author = "[#ffea96]NickName73[]\nCREAsTIVE\n[maroon]Spriters:[]\nRadmir Yakupov\nCat fat\nVeniamin Katyrev\n[salmon]Additional Content from:[]\nTheSkyFather/Minerals";
         }catch (Exception e){
@@ -75,12 +75,6 @@ public void loadContent(){
             Log.err("Gravillaso Liquid loading failed");
             Log.err(e);
         }
-        try {
-            new ModItems().load();
-        }catch (Exception e){
-            Log.err("Gravillaso Items loading failed");
-            Log.err(e);
-        }
         try {
             new ModStatuses().load();
         }catch (Exception e){
@@ -93,12 +87,6 @@ public void loadContent(){
             Log.err("Gravillaso Units loading failed");
             Log.err(e);
         }
-        try {
-            new ModBlocks().load();
-        }catch (Exception e){
-            Log.err("Gravillaso Blocks loading failed");
-            Log.err(e);
-        }
         try {
             new ModPlanets().load();
         }catch (Exception e){
@@ -111,12 +99,6 @@ public void loadContent(){
             Log.err("Gravillaso Sectors loading failed");
             Log.err(e);
         }
-        try {
-            new ModTechTree().load();
-        }catch (Exception e){
-            Log.err("Gravillaso TechTree loading failed");
-            Log.err(e);
-        }
     }
 
 }