Skip to content

Commit

Permalink
Port Redstone (Digital) Valve from Engineer's Decor (#5958)
Browse files Browse the repository at this point in the history
* First steps towards pipe valves

* Update pipe valves to be mostly done codewise

* First pass of pipe valve data, texture needs updating

* Fluid valve technical side is working except drain passthrough

* Fix pull-through for pipe valves

* Pipe valve bounding box creation

* Update pipe valve texture to match IE pipes

* Make pipe valve respond to redstone

* Always place mixed fluid on bottom. Fixes #5280

* Get model and properties set up for connection

* Always place mixed fluid on bottom. Fixes git #5280

* Pipe now properly connects to redstone sources

* Fix capability registry not registering properly

* Add manual entry

* Optimize PNGs
  • Loading branch information
voidsong-dragonfly authored Jun 20, 2024
1 parent 407a4a2 commit 169c7b7
Show file tree
Hide file tree
Showing 31 changed files with 656 additions and 34 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,14 @@ public class IEProperties
public static final BooleanProperty ACTIVE = BooleanProperty.create("active");
public static final BooleanProperty MIRRORED = BooleanProperty.create("mirrored");

public static final BooleanProperty UP = BooleanProperty.create("up");
public static final BooleanProperty DOWN = BooleanProperty.create("down");
public static final BooleanProperty NORTH = BooleanProperty.create("north");
public static final BooleanProperty SOUTH = BooleanProperty.create("south");
public static final BooleanProperty WEST = BooleanProperty.create("west");
public static final BooleanProperty EAST = BooleanProperty.create("east");


public static final IntegerProperty INT_16 = IntegerProperty.create("int_16", 0, 15);
public static final IntegerProperty INT_32 = IntegerProperty.create("int_32", 0, 31);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -680,6 +680,12 @@ private void metalDevices(RecipeOutput out)
.define('c', Ingredients.COMPONENT_ELECTRONIC)
.unlockedBy("has_"+toPath(Ingredients.COMPONENT_ELECTRONIC), has(Ingredients.COMPONENT_ELECTRONIC))
.save(out, toRL(toPath(MetalDevices.ELECTROMAGNET)));
shapelessMisc(MetalDevices.PIPE_VALVE)
.requires(Ingredient.of(MetalDevices.FLUID_PIPE))
.requires(Ingredient.of(Ingredients.COMPONENT_STEEL))
.requires(Ingredient.of(Connectors.CONNECTOR_REDSTONE))
.unlockedBy("has_fluid_pipe", has(MetalDevices.FLUID_PIPE))
.save(out, toRL(toPath(MetalDevices.PIPE_VALVE)));
}

private void addCoveyorCoveringRecipe(ItemLike basic, RecipeOutput out)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -492,6 +492,7 @@ private void registerPickaxeMineable()
MetalDevices.TURRET_GUN,
MetalDevices.CLOCHE,
MetalDevices.ELECTROMAGNET,
MetalDevices.PIPE_VALVE,
MetalDecoration.LV_COIL,
MetalDecoration.MV_COIL,
MetalDecoration.HV_COIL,
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 169c7b7

Please sign in to comment.