Skip to content

Commit

Permalink
update
Browse files Browse the repository at this point in the history
  • Loading branch information
reobf committed Feb 8, 2025
1 parent a292f2b commit 81496bf
Show file tree
Hide file tree
Showing 16 changed files with 1,630 additions and 1,649 deletions.
2 changes: 1 addition & 1 deletion dependencies.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@ dependencies {


api("com.github.GTNewHorizons:ironchest:6.0.87:dev")

api("com.github.GTNewHorizons:RemoteIO:2.7.1:dev")


////////
Expand Down
17 changes: 17 additions & 0 deletions src/main/java/reobf/proghatches/ae/BlockAutoFillerMKII.java
Original file line number Diff line number Diff line change
@@ -1,15 +1,19 @@
package reobf.proghatches.ae;

import java.util.EnumSet;
import java.util.HashMap;
import java.util.List;

import net.minecraft.block.BlockContainer;
import net.minecraft.block.material.Material;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.ChatComponentText;
import net.minecraft.util.StatCollector;
import net.minecraft.world.World;
import net.minecraftforge.common.util.FakePlayer;
import net.minecraftforge.common.util.ForgeDirection;

import com.glodblock.github.FluidCraft;
Expand Down Expand Up @@ -76,5 +80,18 @@ public void addInformation(ItemStack p_77624_1_, List l) {
public String getName(ItemStack p_77624_1_) {
// TODO Auto-generated method stub
return null;
}
@Override
public void onBlockPlacedBy(World worldIn, int x, int y, int z, EntityLivingBase placer, ItemStack itemIn) {

super.onBlockPlacedBy(worldIn, x, y, z, placer, itemIn);
if(worldIn.isRemote==false)
if (placer instanceof EntityPlayer) {
if (!(placer instanceof FakePlayer))
((TileAutoFillerMKII) worldIn.getTileEntity(x, y, z)).mark((EntityPlayer) placer);
}



}
}
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ public BlockCyclicPatternSubmitter(Material p_i45386_1_) {
public void onBlockPlacedBy(World worldIn, int x, int y, int z, EntityLivingBase placer, ItemStack itemIn) {

super.onBlockPlacedBy(worldIn, x, y, z, placer, itemIn);

if(worldIn.isRemote==false)
if (placer instanceof EntityPlayer) {
if (!(placer instanceof FakePlayer))
((TileCyclicPatternSubmitter) worldIn.getTileEntity(x, y, z)).mark((EntityPlayer) placer);
Expand Down
6 changes: 6 additions & 0 deletions src/main/java/reobf/proghatches/ae/TileAutoFillerMKII.java
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
import java.util.LinkedList;
import java.util.List;

import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.inventory.InventoryCrafting;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
Expand Down Expand Up @@ -266,5 +267,10 @@ public NBTTagCompound writeToNBTEventX(NBTTagCompound data) {

return data;
}
public void mark(EntityPlayer placer) {
getProxy().setOwner((EntityPlayer) placer);

}


}
10 changes: 0 additions & 10 deletions src/main/java/reobf/proghatches/ae/a.java

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
import reobf.proghatches.lang.LangManager;
import reobf.proghatches.util.ProghatchesUtil;

public class WirelessControlCover extends CoverBehaviorBase<WirelessControlCover.Data> implements IControlsWorkCover {
public class WirelessControlCover extends CoverBehaviorBase<WirelessControlCover.Data> /*implements IControlsWorkCover*/ {

@Override
public ModularWindow createWindow(CoverUIBuildContext buildContext) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2394,7 +2394,7 @@ public FluidStack[] getDisplayFluid() {
private void broken() {
MyMod.LOG.fatal("FAILED TO UPDATE ME INPUTS!");
MyMod.LOG.fatal("basemeta:" + getBaseMetaTileEntity());

Thread.dumpStack();
if (getBaseMetaTileEntity() != null) {
MyMod.LOG.fatal(
"same:" + (getBaseMetaTileEntity().getMetaTileEntity() == DualInputHatch.this)
Expand All @@ -2412,7 +2412,8 @@ public ItemStack[] getItems() {
all.addAll(circuitInv);
all.add(mInventory[getCircuitSlot()]);
if (recipe == false) {
broken();
if(!broken)
broken();
// Thread.dumpStack();
broken = true;
all.removeIf(Objects::isNull);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -588,7 +588,7 @@ public void removePhantom() {
int size = a.getSizeInventory();
for (int i = 0; i < size; i++) {

if (a.getStackInSlot(i) != null && a.getStackInSlot(i).stackSize > 0 && i != index)//
if (a.getStackInSlot(i) != null && a.getStackInSlot(i).stackSize == 0 && i != index)//
a.decrStackSize(i, 0);// remove 0-sized phantom item
}

Expand Down
Loading

0 comments on commit 81496bf

Please sign in to comment.