Testing

assets/bundles/bundle.shitpost

@@ -1,11 +1,29 @@
-item.meld-glass-mallow.name = Pan-fried Plates
+item.meld2-glass-mallow.name = Pan-fried Plates
 
-item.meld-crucible-plating.name = Boiled Plates
+item.meld2-crucible-plating.name = Boiled Plates
 
-block.meld-sonar-spire.name = Slay the Sonar Spire
+item.meld2-dissonitre.name = Crystal Crack
 
-block.meld-manual-valve.name = Gabe Nuel's Wife
-block.meld-pressure-vent.name = Amogus Escape route
+item.meld2-gunpowder.name = Crack on crack (going through rehab)
+
+block.meld2-sonar-spire.name = Slay the Sonar Spire
+
+block.meld2-manual-valve.name = Gabe Nuel's Wife
+block.meld2-pressure-vent.name = Amogus Escape route
+
+block.meld2-crystal-cracker.name = Tasty Wafer
+block.meld2-crystal-cracker.description = ...you know you wana\n\njust a lil nibble
+
+block.meld2-overflow-chute.name = Smart Router
+block.meld2-overflow-chute.description = Smart Router
+
+block.meld2-depot.name = frankouloadertainer's frankouloadertainer-er
+
+liquid.meld2-aspect.name = Outdated Ass Destroyer
+liquid.meld2-storming-aspect.name = Bombspect
+liquid.meld2-bound-aspect.name = Leanspect
 
 unit.meld-bulbhead.name = Bulbster
-unit.meld-bulbhead.description = Meldieps the allied blocks as it Meldarras.io the enemies
+unit.meld-bulbhead.description = Meldieps the allied blocks as it Meldarras.io the enemies
+
+liquid.meld2-meld = Meld 2: Electric meldaloo

assets/shaders/light.frag

@@ -0,0 +1,41 @@
+uniform sampler2D u_texture;
+uniform sampler2D u_lights;
+uniform sampler2D u_exclusion;
+
+uniform vec2 u_resolution;
+uniform vec2 u_campos;
+
+uniform vec4 u_ambient;
+
+varying vec2 v_texCoords;
+
+void main(){
+
+    float banding = 8.0;
+
+    //Exclusion
+    vec4 exclusion = texture2D(u_exclusion, v_texCoords);
+
+    vec4 positionAmbient = clamp(vec4(u_ambient.rgb - exclusion.rgb * exclusion.a, u_ambient.a), 0.0, 1.0);
+
+    //Light color
+    vec4 color = texture2D(u_lights, v_texCoords);
+
+    float alpha = color.a;
+
+    //Get the scaling right here...
+    alpha = clamp(floor((alpha) * 8.0)/8.0, 0.0, 1.0) * 0.3 + clamp(floor(alpha * 3.0)/3.0, 0.0, 1.0) * 0.3 + alpha * 0.4;
+
+    vec4 totalColor = clamp(vec4(color.rgb * alpha, 1) + vec4(positionAmbient.rgb * positionAmbient.a, 1), 0.0, 1.0);
+
+    vec4 background = clamp(texture2D(u_texture, v_texCoords), 0.0, 1.0);
+
+    gl_FragColor = clamp(background * totalColor, 0.0, 1.0);
+
+    /*
+    float max = max(gl_FragColor.r, gl_FragColor.g, gl_FragColor.b);
+    float min = min(gl_FragColor.r, gl_FragColor.g, gl_FragColor.b);
+    float chrom = max - min;
+    float L = (max + min)/2;
+    */
+}

assets/shaders/sonar.frag

@@ -0,0 +1,24 @@
+uniform sampler2D u_texture;
+
+uniform vec2 u_resolution;
+uniform vec2 u_campos;
+
+uniform vec4 u_color;
+
+uniform float u_time;
+
+varying vec2 v_texCoords;
+
+void main() {
+
+    vec4 color = texture2D(u_texture, v_texCoords);
+    gl_FragColor = color;
+
+    if(color.r == 1 && color.g + color.b > 0){
+
+        color.a *= 0.5 * abs(sin((v_texCoords.x + v_texCoords.y) * 20.0 + u_time/20.0));
+
+        gl_FragColor = color;
+    }
+    else gl_FragColor = vec4(color.rgb, 0);
+}

mod.hjson

@@ -1,8 +1,8 @@
 #the mod name as displayed in-game
-displayName: "Meld (Java)"
+displayName: "[[]#ea9ad6]Meld: Sand and Sunder[[]]"
 
 #the internal name of your mod
-name: "meld"
+name: "meld2"
 
 #your name
 author: "Sh1p"
@@ -11,13 +11,15 @@ author: "Sh1p"
 main: "meld.Meld"
 
 #the mod description as seen in the mod dialog
-description: "Meld Java.\n\n[[]accent]Only has custom game content! (play the info map to understand)[[]]\n\nIncompatable with hjson meld"
+description: "[[]gray]Under scattered gloomy sunlight in the shimmering seas, within the shifting sanctuary, Strata awoke.\n\nNo mouth to scream with, no skin to feel with, yet one sense remained.\n\nA great longing of meaning.\n\n[[]accent]Only has custom game content! (play the info map to understand)[[]]"
+
+subtitle: "[[]accent]What choice do I have...[[]]"
 
 #the mod version
-version: gameplay test v3
+version: gameplay test 5
 
 #the minimum game build required to run this mod
-minGameVersion: 157
+minGameVersion: 154
 
 #this is a java mod
 java: true

src/meld/Meld.java

@@ -1,40 +1,35 @@
 package meld;
 
 import arc.*;
+import arc.graphics.Blending;
 import arc.graphics.Color;
 import arc.graphics.Colors;
-import arc.math.geom.Geometry;
-import arc.math.geom.Point2;
-import arc.struct.IntSeq;
+import arc.graphics.g2d.Draw;
 import arc.struct.Seq;
-import arc.util.Log;
-import arc.util.Time;
+import arc.util.Reflect;
 import arc.util.Tmp;
 import meld.content.*;
 import meld.core.*;
-import meld.entities.unit.abilities.BezerkAbility;
+import meld.graphics.*;
 import meld.fluid.AspectGroup;
-import meld.graphics.MeldRegions;
 import meld.meta.MeldStatUnit;
+import meld.meta.MeldStats;
+import meld.ui.MeldSettings;
+import meld.world.CustomExplosions;
 import mindustry.Vars;
-import mindustry.content.Blocks;
-import mindustry.content.Bullets;
-import mindustry.content.Fx;
-import mindustry.content.UnitTypes;
 import mindustry.ctype.UnlockableContent;
 import mindustry.game.EventType;
-import mindustry.game.EventType.*;
+import mindustry.game.Team;
+import mindustry.graphics.Layer;
 import mindustry.mod.*;
-import mindustry.world.Tile;
-import mindustry.world.blocks.environment.Floor;
+import mindustry.type.UnitType;
 import mindustry.world.meta.Stat;
-import mindustry.world.meta.StatUnit;
 import rhino.ImporterTopLevel;
 import rhino.NativeJavaPackage;
 
 
 public class Meld extends Mod{
-    public static final String name = "meld";
+    public static final String name = "meld2";
 
     public static NativeJavaPackage p = null;
 
@@ -43,7 +38,22 @@ public class Meld extends Mod{
     public Meld(){
         Events.on(EventType.ClientLoadEvent.class, e -> {
             MeldRegions.load();
+            MeldMappings.loadAfter();
         });
+
+        Events.run(EventType.Trigger.draw, () -> {
+            if(!MeldSettings.overlayOverFog) return;
+            Draw.draw(Layer.fogOfWar + 2, AboveOverlayRenderer::draw);
+
+            //Just additive blending the fuck out of this layer in particular cause like fuck yes
+            Draw.drawRange(MeldLayers.smokeHigh, 1, () -> Draw.blend(Blending.additive), () -> Draw.blend(Blending.normal));
+        });
+
+        Events.on(EventType.FileTreeInitEvent.class, e -> {
+            Core.app.post(MeldShaders::load);
+        });
+
+        CustomExplosions.load();
     }
 
     public static String prefix(String in){
@@ -76,9 +86,14 @@ public static String gradient(String in, Color... colors){
     @Override
     public void init() {
         super.init();
-        
+
         melting = new Melting();
-
+
+        Core.settings.put(SettingKeys.lighting, true);
+
+        MeldSettings.loadSettings();
+        if(MeldSettings.replaceLighting) Reflect.set(Vars.renderer, "lights", new MeldLightRenderer());
+
         Vars.mods.getScripts().runConsole(
                 "function buildWorldP(){return Vars.world.buildWorld(Vars.player.x, Vars.player.y)}");
         ImporterTopLevel scope = (ImporterTopLevel) Vars.mods.getScripts().scope;
@@ -87,7 +102,8 @@ public void init() {
                 "meld",
                 "meld.content",
                 "meld.world",
-                "meld.fluid"
+                "meld.fluid",
+                "meld.graphics"
         );
 
         packages.each(name -> {
@@ -103,28 +119,40 @@ public void init() {
     @Override
     public void loadContent(){
         MeldStatusEffects.load();
-        MeldBullets.load();
-        MeldUnits.load();
         MeldItems.load();
         MeldLiquids.load();
+        MeldBullets.load();
+        MeldUnits.load();
         MeldBlocks.load();
         MeldEnvironment.load();
+        MeldPlanets.load();
 
         //Just loads localised names
         AspectGroup.loadAll();
 
-        Vars.content.items().each(c -> {
-                c.stats.add(Stat.buildCost, c.cost, MeldStatUnit.ticks);
-        });
-        
+        //Loaded after all the content
+        MeldMappings.load();
+        MeldStats.loadModifications();
+
         Vars.content.blocks().each(b -> {
-            if(b.minfo.mod != null && b.minfo.mod.name.equals("meld")){
+            if(b.minfo.mod != null && b.minfo.mod.name.equals("meld2")){
                 b.deconstructDropAllLiquid = true;
             }
         });
 
         Vars.content.liquids().each(l -> {
             Colors.put(l.name, l.color);
         });
+        Vars.content.items().each(l -> {
+            Colors.put(l.name, l.color);
+        });
+
+        Vars.content.each(c -> {
+            if(!(c instanceof UnlockableContent content)) return;
+            if(content.minfo.mod != null && content.minfo.mod.name.equals("meld2")) {
+                content.shownPlanets.clear();
+                content.shownPlanets.addAll(MeldPlanets.ikaru);
+            }
+        });
     }
 }

src/meld/SettingKeys.java

@@ -0,0 +1,17 @@
+package meld;
+
+public class SettingKeys {
+    public static String pref(String in){
+        return "setting.meld-" + in;
+    }
+
+    public static String lighting = pref("lighting"),
+    invertAmbient = pref("invert-ambient"),
+    connectedSonar = pref("connected-sonar"),
+    unitLightScale = pref("unit-light-scale"),
+    overlayOverFog = pref("highvis-overlay"),
+
+    //Expirimental- doesn't sync in multiplayer and off by default
+    bulbheadOmnimove = pref("bulbhead-omnimove"),
+    portSaves = pref("port-saves");
+}

src/meld/content/MeldAttributes.java

@@ -4,6 +4,8 @@
 
 public class MeldAttributes {
 
-    public static final Attribute aetherAttr = Attribute.add("aether");
+    public static final Attribute aetherAttr = Attribute.add("aether"),
+    soilAttr = Attribute.add("aether-soil"),
+    meld = Attribute.add("meld-floor");
 
 }