Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
a89aa53
rebase
QmelZ Mar 31, 2026
44b731b
merge?
stacktrace-error Apr 2, 2026
1fa1c72
merge?
stacktrace-error Apr 2, 2026
e0511a3
merge?
stacktrace-error Apr 2, 2026
de4db91
make red go away
stacktrace-error Apr 2, 2026
62abe44
make red go away
stacktrace-error Apr 2, 2026
e05f6da
make diff go away
stacktrace-error Apr 2, 2026
00c80d0
make diff go away
stacktrace-error Apr 2, 2026
16644dd
refactor producers to be consistent with other StupidModules
stacktrace-error Apr 2, 2026
3c1769f
some fixes after testing
stacktrace-error Apr 2, 2026
6e2b56b
attributes, renames
stacktrace-error Apr 3, 2026
980b19f
more pins everywhere, I can delete ConsumeAllModule
stacktrace-error Apr 3, 2026
281d800
consumption fixes
stacktrace-error Apr 3, 2026
cafe8fc
kill everything else in the project, also heat production
stacktrace-error Apr 3, 2026
e99414e
heat consumption
stacktrace-error Apr 4, 2026
166a3f4
support vanilla drawers
stacktrace-error Apr 4, 2026
4442442
Core linking, Vivisection, Channel director patch
Sh1penfire Apr 6, 2026
82d37d4
yknow those commits where you manually resolve errors and then realis…
Sh1penfire Apr 6, 2026
28b1f85
HAAAAAAAAAAAAAAAAAAA
Sh1penfire Apr 6, 2026
5da8024
when you realise you can just
Sh1penfire Apr 6, 2026
58bc56b
and when you just can't
Sh1penfire Apr 6, 2026
b2a30bf
Merge branch 'testing' into testing
stacktrace-error Apr 6, 2026
e5c574d
Shredstorm, Channel hubs, Pointago
Sh1penfire Apr 7, 2026
06a665a
Merge pull request #6 from stacktrace-error/testing
Sh1penfire Apr 7, 2026
ad6aef0
AND THE RALLY GOES *PIIIIIIIIIING* (no it doesn't)
Sh1penfire Apr 14, 2026
3d9aaa2
Yeah so I uh... bulbhead can boost now
Sh1penfire Apr 14, 2026
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
192 changes: 32 additions & 160 deletions assets/bundles/bundle.properties

Large diffs are not rendered by default.

5 changes: 4 additions & 1 deletion assets/bundles/bundle.shitpost
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,7 @@ item.meld-crucible-plating.name = Boiled Plates
block.meld-sonar-spire.name = Slay the Sonar Spire

block.meld-manual-valve.name = Gabe Nuel's Wife
block.meld-pressure-vent.name = Amogus Escape route
block.meld-pressure-vent.name = Amogus Escape route

unit.meld-bulbhead.name = Bulbster
unit.meld-bulbhead.description = Meldieps the allied blocks as it Meldarras.io the enemies
Binary file modified assets/maps/gameplay-testmap-2.msav
Binary file not shown.
Binary file modified assets/sprites/blocks/fluid/channel-director.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified assets/sprites/blocks/fluid/channel-hub-bottom.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified assets/sprites/blocks/fluid/channel-hub.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/sprites/bullet/crystalline-smog.aseprite
Binary file not shown.
Binary file added assets/sprites/bullet/crystalline-smog.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/sprites/bullet/dual-spike.aseprite
Binary file not shown.
Binary file added assets/sprites/bullet/dual-spike.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/sprites/bullet/thorn-back.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/sprites/bullet/thorn.aseprite
Binary file not shown.
Binary file added assets/sprites/bullet/thorn.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed assets/sprites/effect/sparkle.aseprite
Binary file not shown.
Binary file modified assets/sprites/effects/chain.aseprite
Binary file not shown.
Binary file modified assets/sprites/effects/chain.png
Binary file added assets/sprites/liquids/storming-aspect.png
Binary file added assets/sprites/liquids/thundering-aether.png
Binary file added assets/sprites/units/meld/billa/billa-joint.png
Binary file added assets/sprites/units/meld/billa/billa-leg-base.png
Binary file added assets/sprites/units/meld/billa/billa-leg.png
Binary file added assets/sprites/units/meld/billa/billa.png
Binary file removed assets/sprites/units/meld/globkin-gun-blob.png
Diff not rendered.
Binary file added assets/sprites/units/meld/pointago/pointago-foot.png
Binary file added assets/sprites/units/meld/pointago/pointago-leg.png
Binary file added assets/sprites/units/meld/pointago/pointago.png
Binary file added assets/sprites/units/meld/scorcher/scorcher-foot.png
Binary file added assets/sprites/units/meld/scorcher/scorcher-leg.png
Binary file added assets/sprites/units/meld/scorcher/scorcher.png
2 changes: 1 addition & 1 deletion mod.hjson
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ main: "meld.Meld"
description: "Meld Java.\n\n[[]accent]Only has custom game content! (play the info map to understand)[[]]\n\nIncompatable with hjson meld"

#the mod version
version: gameplay expirimental v1
version: gameplay expirimental v3

#the minimum game build required to run this mod
minGameVersion: 154
Expand Down
31 changes: 29 additions & 2 deletions src/meld/Meld.java
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

import arc.*;
import arc.graphics.Color;
import arc.graphics.Colors;
import arc.math.geom.Geometry;
import arc.math.geom.Point2;
import arc.struct.IntSeq;
Expand All @@ -10,24 +11,38 @@
import arc.util.Tmp;
import meld.content.*;
import meld.core.*;
import meld.entities.unit.abilities.BezerkAbility;
import meld.fluid.AspectGroup;
import meld.graphics.MeldRegions;
import meld.meta.MeldStatUnit;
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.mod.*;
import mindustry.world.Tile;
import mindustry.world.blocks.environment.Floor;
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 NativeJavaPackage p = null;

public static Melting melting;

public Meld(){
Events.on(EventType.ClientLoadEvent.class, e -> {
MeldRegions.load();
});
}

public static String prefix(String in){
Expand Down Expand Up @@ -69,7 +84,8 @@ public void init() {
Seq<String> packages = Seq.with(
"meld",
"meld.content",
"meld.world"
"meld.world",
"meld.fluid"
);

packages.each(name -> {
Expand All @@ -91,11 +107,22 @@ public void loadContent(){
MeldLiquids.load();
MeldBlocks.load();
MeldEnvironment.load();

//Just loads localised names
AspectGroup.loadAll();

Vars.content.items().each(c -> {
c.stats.add(Stat.buildCost, c.cost, MeldStatUnit.ticks);
});

Vars.content.blocks().each(b -> {
if(b.minfo.mod != null && b.minfo.mod.name.equals("meld")){
b.deconstructDropAllLiquid = true;
}
});

Vars.content.liquids().each(l -> {
Colors.put(l.name, l.color);
});
}
}
Loading
Loading