Skip to content

Commit

Permalink
fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
@skiprocks999
skiprocks999 committed Dec 11, 2024
1 parent 33b1da7 commit ef60bfa
Show file tree
Hide file tree
Showing 7 changed files with 20 additions and 16 deletions.
2 changes: 1 addition & 1 deletion runs/client/usercache.json
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
[{"name":"Dev","uuid":"380df991-f603-344c-a090-369bad2a924a","expiresOn":"2024-12-25 20:15:16 -0600"}]
[{"name":"Dev","uuid":"380df991-f603-344c-a090-369bad2a924a","expiresOn":"2025-01-10 19:18:34 -0600"}]
11 changes: 7 additions & 4 deletions src/main/java/electrodynamics/common/network/type/FluidNetwork.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,10 @@ public FluidStack emit(FluidStack transfer, ArrayList<BlockEntity> ignored, bool
availableAcceptors.addAll(acceptorSet);

availableAcceptors.removeAll(ignored);
availableAcceptors.removeAll(priorityFilled.getSecond());

if(priorityFilled.getSecond().size() > 0) {
availableAcceptors.removeAll(priorityFilled.getSecond());
}

if (availableAcceptors.isEmpty()) {
return FluidStack.EMPTY;
Expand All @@ -98,7 +101,7 @@ public FluidStack emit(FluidStack transfer, ArrayList<BlockEntity> ignored, bool

for (BlockEntity tile : availableAcceptors) {

perTile = new FluidStack(initial.getFluid(), initial.getAmount() / size);
perTile = new FluidStack(initial.getFluid(), (int) ((double) initial.getAmount() / (double) size));
prePerTile = perTile.copy();

connections = acceptorInputMap.getOrDefault(tile, new HashSet<>());
Expand All @@ -107,7 +110,7 @@ public FluidStack emit(FluidStack transfer, ArrayList<BlockEntity> ignored, bool

for (Direction dir : connections) {

perConnection = new FluidStack(initial.getFluid(), perTile.getAmount() / connectionsSize);
perConnection = new FluidStack(initial.getFluid(), (int) ((double) perTile.getAmount() / (double) connectionsSize));
prePerConnection = perConnection.copy();

amtTaken = FluidUtilities.receiveFluid(tile, dir, perConnection, false);
Expand Down Expand Up @@ -273,7 +276,7 @@ public boolean isConductorClass(BlockEntity tile) {

@Override
public boolean isAcceptor(BlockEntity acceptor, Direction orientation) {
return FluidUtilities.isFluidReceiver(acceptor, orientation);
return FluidUtilities.isFluidReceiver(acceptor, orientation.getOpposite());
}

@Override
Expand Down
7 changes: 3 additions & 4 deletions src/main/java/electrodynamics/common/tile/pipelines/fluid/GenericTileFluidPipe.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
import java.util.ArrayList;
import java.util.HashSet;

import com.google.common.collect.Lists;
import com.google.common.collect.Sets;

import electrodynamics.api.network.cable.type.IFluidPipe;
Expand Down Expand Up @@ -66,12 +67,10 @@ public boolean isFluidValid(int tank, FluidStack stack) {

@Override
public int fill(FluidStack resource, FluidAction action) {
if (action == FluidAction.SIMULATE || getNetwork() == null) {
if (action == FluidAction.SIMULATE || getNetwork() == null || resource.isEmpty()) {
return 0;
}
ArrayList<BlockEntity> ignored = new ArrayList<>();
ignored.add(level.getBlockEntity(new BlockPos(worldPosition).relative(dir)));
return fluidNetwork.emit(resource, ignored, false).getAmount();
return fluidNetwork.emit(resource, Lists.newArrayList(level.getBlockEntity(new BlockPos(worldPosition).relative(dir))), false).getAmount();
}

@Override
Expand Down
3 changes: 1 addition & 2 deletions src/main/java/electrodynamics/datagen/client/ElectrodynamicsBlockStateProvider.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@
import net.minecraft.resources.ResourceLocation;
import net.minecraft.world.item.ItemDisplayContext;
import net.minecraft.world.level.block.Block;
import net.minecraft.world.level.block.Blocks;
import net.minecraft.world.level.block.PressurePlateBlock;
import net.minecraft.world.level.block.SnowyDirtBlock;
import net.minecraft.world.level.block.state.properties.BlockStateProperties;
Expand Down Expand Up @@ -535,7 +534,7 @@ public ItemModelBuilder horrRotatedBlock(Block block, ModelFile file, int yRotat
}

public ItemModelBuilder horrRotatedLitBlock(DeferredHolder<Block, ? extends Block> block, ModelFile off, ModelFile on, boolean registerItem) {
return horrRotatedBlock(block, on, 0, 0, registerItem);
return horrRotatedLitBlock(block, off, on, 0, 0, registerItem);
}

public ItemModelBuilder horrRotatedLitBlock(DeferredHolder<Block, ? extends Block> block, ModelFile off, ModelFile on, int yRotationOffset, int xRotation, boolean registerItem) {
Expand Down
6 changes: 3 additions & 3 deletions src/main/java/electrodynamics/datagen/server/ElectrodynamicsLootTablesProvider.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -201,20 +201,20 @@ public <T extends GenericTile> void addMachineTable(Block block, DeferredHolder<
* @param reg The block that will be added
* @author SeaRobber69
*/
public void addSilkTouchOnlyTable(DeferredHolder<Block, Block> reg) {
public void addSilkTouchOnlyTable(DeferredHolder<Block, ? extends Block> reg) {
Block block = reg.get();
add(block, createSilkTouchOnlyTable(name(block), block));
}

public void addFortuneAndSilkTouchTable(DeferredHolder<Block, Block> reg, Item nonSilk, int minDrop, int maxDrop) {
public void addFortuneAndSilkTouchTable(DeferredHolder<Block, ? extends Block> reg, Item nonSilk, int minDrop, int maxDrop) {
addFortuneAndSilkTouchTable(reg.get(), nonSilk, minDrop, maxDrop);
}

public void addFortuneAndSilkTouchTable(Block block, Item nonSilk, int minDrop, int maxDrop) {
add(block, createSilkTouchAndFortuneTable(name(block), block, nonSilk, minDrop, maxDrop));
}

public void addSimpleBlock(DeferredHolder<Block, Block> reg) {
public void addSimpleBlock(DeferredHolder<Block, ? extends Block> reg) {
addSimpleBlock(reg.get());
}

Expand Down
2 changes: 1 addition & 1 deletion ...gen/server/recipe/types/custom/fluid2item/ElectrodynamicsChemicalCrystallizerRecipes.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ public class ElectrodynamicsChemicalCrystallizerRecipes extends AbstractRecipeGe
public static double CHEMICALCRYSTALLIZER_USAGE_PER_TICK = 800.0;
public static int CHEMICALCRYSTALLIZER_REQUIRED_TICKS = 200;

private final String modID;
public final String modID;

public ElectrodynamicsChemicalCrystallizerRecipes(String modID) {
this.modID = modID;
Expand Down
5 changes: 4 additions & 1 deletion src/main/java/electrodynamics/prefab/properties/Property.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@

import electrodynamics.Electrodynamics;
import electrodynamics.common.packet.types.server.PacketSendUpdatePropertiesServer;
import electrodynamics.registers.ElectrodynamicsBlocks;
import net.minecraft.core.HolderLookup;
import net.minecraft.nbt.CompoundTag;
import net.minecraft.world.level.block.Block;
Expand Down Expand Up @@ -129,6 +128,10 @@ public Property<T> set(Object updated) {
public void forceDirty() {
if (!manager.getOwner().getLevel().isClientSide()) {
manager.setDirty(this);
} else {
CompoundTag data = new CompoundTag();
saveToTag(data, manager.getOwner().getLevel().registryAccess());
PacketDistributor.sendToServer(new PacketSendUpdatePropertiesServer(data, getIndex(), manager.getOwner().getBlockPos()));
}
}

Expand Down

0 comments on commit ef60bfa

Please sign in to comment.