Skip to content

Commit

Permalink
Fixed filters.
Browse files Browse the repository at this point in the history
  • Loading branch information
MartinSVK12 committed Apr 1, 2024
1 parent c9c293b commit 9742945
Show file tree
Hide file tree
Showing 9 changed files with 28 additions and 6 deletions.
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@ dependencies {
implementation project(path: ":catalyst:effects",configuration: "namedElements")

//implementation project(path: ":dragonfly",configuration: "namedElements")
modImplementation "DragonFly:dragonfly:${project.dragonfly_version}"
modImplementation files("libs/dragonfly-1.4.7-7.1-test.2.jar") //"DragonFly:dragonfly:${project.dragonfly_version}"
modImplementation "BTWaila:btwaila:${project.btwaila_version}"
modImplementation "TerrainAPI:terrainapi:${project.terrain_api_version}"
//modImplementation "retrostorage:retrostorage:1.3.0"
Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ loader_version=0.15.6-babric.4-bta
# Mods
halplibe_version=3.5.1
modmenu_version=2.0.4
dragonfly_version=1.4.4-7.1
dragonfly_version=1.4.6-7.1
btwaila_version=1.0.9-7.1
terrain_api_version=1.4.2-7.1

Expand Down
Binary file added libs/dragonfly-1.4.7-7.1-test.2.jar
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

import net.fabricmc.api.ModInitializer;

import net.fabricmc.loader.api.FabricLoader;
import net.minecraft.client.Minecraft;
import net.minecraft.client.entity.fx.EntityFX;
import net.minecraft.client.gui.Gui;
Expand Down Expand Up @@ -1257,6 +1258,7 @@ public void onInitialize() {
}

public SignalIndustries(){

//RecipeFIleLoader.load("/assets/signalindustries/recipes/recipes.txt",mapOf(new String[]{"SignalIndustries"},new String[]{"sunsetsatellite.signalindustries.SignalIndustries"}));
BlockModelDispatcher.getInstance().addDispatch(dilithiumRail,new BlockModelRenderBlocks(9));
BlockModelDispatcher.getInstance().addDispatch(energyStill,new BlockModelRenderBlocks(4));
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,10 @@
import net.minecraft.core.block.entity.TileEntityChest;
import net.minecraft.core.block.material.Material;
import net.minecraft.core.entity.EntityItem;
import net.minecraft.core.entity.EntityLiving;
import net.minecraft.core.entity.player.EntityPlayer;
import net.minecraft.core.item.ItemStack;
import net.minecraft.core.util.helper.Side;
import net.minecraft.core.world.World;
import sunsetsatellite.catalyst.core.util.Direction;
import sunsetsatellite.catalyst.fluids.impl.tiles.TileEntityFluidPipe;
Expand Down Expand Up @@ -76,6 +78,18 @@ public boolean blockActivated(World world, int i, int j, int k, EntityPlayer ent
}
}

@Override
public void setDefaultDirection(World world, int i, int j, int k) {
if (!world.isClientSide) {
world.setBlockMetadataWithNotify(i, j, k, 0);
}
}

@Override
public void onBlockPlaced(World world, int x, int y, int z, Side side, EntityLiving entity, double sideHeight) {
world.setBlockMetadataWithNotify(x, y, z, 0);
}

@Override
protected TileEntity getNewBlockEntity() {
return new TileEntityFilter();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,9 @@ public class ItemConduitStateInterpreter extends MetaStateInterpreter {
@Override
public HashMap<String, String> getStateMap(WorldSource worldSource, int i, int j, int k, Block block, int meta) {
HashMap<String, String> states = new HashMap<>();
/*if(!(worldSource.getBlockTileEntity(i,j,k) instanceof TileEntityItemConduit)){
return states;
}*/
TileEntityItemConduit tile = (TileEntityItemConduit) worldSource.getBlockTileEntity(i,j,k);
for (Direction direction : Direction.values()) {
boolean show = false;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -100,11 +100,11 @@ public void readFromNBT(CompoundTag tag) {

public enum FilterSide {
RED(Direction.Y_POS),
GREEN(Direction.Z_NEG),
BLUE(Direction.X_NEG),
GREEN(Direction.Z_POS),
BLUE(Direction.X_POS),
CYAN(Direction.Y_NEG),
MAGENTA(Direction.Z_POS),
YELLOW(Direction.X_POS);
MAGENTA(Direction.Z_NEG),
YELLOW(Direction.X_NEG);

private final Direction direction;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -175,6 +175,9 @@ public void extractItem(){
}
}
}
if(stack.stackSize <= 0){
inv.setInventorySlotContents(slot,null);
}
return;
}
if(exit == null){
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 9742945

Please sign in to comment.