Browse Source

Fixed an Item Pipe thing and reduced Prismarine Pylons

Gregorius Techneticies 2 months ago
parent
commit
17cc8a7fed
Signed by: Gregorius Techneticies <gregoriustech@gmail.com> GPG Key ID: 1B693EA14F2FD70F

+ 2
- 2
src/main/java/gregapi/tileentity/connectors/MultiTileEntityPipeItem.java View File

@@ -224,7 +224,7 @@ public class MultiTileEntityPipeItem extends TileEntityBase10ConnectorRendered i
224 224
 	public boolean insertItemStackIntoTileEntity(Object aSender, byte aSide) {
225 225
 		if (!FACE_CONNECTED[aSide][mDisabledOutputs] && canEmitItemsTo(aSide, aSender)) {
226 226
 			DelegatorTileEntity<TileEntity> tDelegator = getAdjacentTileEntity(aSide);
227
-			if (tDelegator.mTileEntity != null && !(tDelegator.mTileEntity instanceof TileEntityBase09Connector)) {
227
+			if (ST.canConnect(tDelegator) && !(tDelegator.mTileEntity instanceof TileEntityBase09Connector)) {
228 228
 				if ((!(tDelegator.mTileEntity instanceof TileEntityHopper) && !(tDelegator.mTileEntity instanceof TileEntityDispenser)) || getMetaDataAtSide(aSide) != tDelegator.mSideOfTileEntity) {
229 229
 					// special cases for the win...
230 230
 					CoverData tCovers = getCoverData();
@@ -268,7 +268,7 @@ public class MultiTileEntityPipeItem extends TileEntityBase10ConnectorRendered i
268 268
 	@Override public boolean canExtractItem2(int aSlot, ItemStack aStack, byte aSide) {return SIDES_INVALID[aSide] || connected(aSide);}
269 269
 	@Override public ItemStack[] getDefaultInventory(NBTTagCompound aNBT) {ItemStack[] rStack = super.getDefaultInventory(aNBT); ACCESSIBLE_SLOTS = new int[rStack.length]; for (int i = 0; i < ACCESSIBLE_SLOTS.length; i++) ACCESSIBLE_SLOTS[i] = i; return rStack;}
270 270
 	
271
-	@Override public boolean canEmitItemsTo                 (byte aSide, Object aSender) {return (aSender != this || aSide != mLastReceivedFrom) && connected(aSide) && !getAirAtSide(aSide);}
271
+	@Override public boolean canEmitItemsTo                 (byte aSide, Object aSender) {return (aSender != this || aSide != mLastReceivedFrom) && connected(aSide);}
272 272
 	@Override public boolean canAcceptItemsFrom             (byte aSide, Object aSender) {return connected(aSide);}
273 273
 	
274 274
 	@Override public boolean canConnect                     (byte aSide, DelegatorTileEntity<TileEntity> aDelegator) {return aDelegator.mTileEntity instanceof ISidedInventory ? aDelegator.mTileEntity instanceof ITileEntityCanDelegate || ((ISidedInventory)aDelegator.mTileEntity).getAccessibleSlotsFromSide(aDelegator.mSideOfTileEntity).length > 0 : ST.canConnect(aDelegator);}

+ 0
- 1
src/main/java/gregapi/util/ST.java View File

@@ -639,7 +639,6 @@ public class ST {
639 639
 		return F;
640 640
 	}
641 641
 	
642
-
643 642
 	@Deprecated public static boolean canTake (IInventory      aFrom, byte aSideFrom, int aSlotFrom, ItemStack aStackFrom) {return canTake(aFrom, aSideFrom, aSideFrom, aSlotFrom, aStackFrom);}
644 643
 	@Deprecated public static boolean canTake_(ISidedInventory aFrom, byte aSideFrom, int aSlotFrom, ItemStack aStackFrom) {return canTake(aFrom, aSideFrom, aSideFrom, aSlotFrom, aStackFrom);}
645 644
 	

+ 4
- 4
src/main/java/gregtech/worldgen/WorldgenDeepOcean.java View File

@@ -1,5 +1,5 @@
1 1
 /**
2
- * Copyright (c) 2020 GregTech-6 Team
2
+ * Copyright (c) 2021 GregTech-6 Team
3 3
  *
4 4
  * This file is part of GregTech.
5 5
  *
@@ -50,10 +50,10 @@ public class WorldgenDeepOcean extends WorldgenObject {
50 50
 			default:
51 51
 				// Keep Deep Ocean Normal.
52 52
 				return F;
53
-			case  5: case  6: case  7: case  8: case  9:
53
+			case  8: case  9: case 10: case 11:
54 54
 				// Corals maybe?
55 55
 				return F;
56
-			case 10: case 11: case 12:
56
+			case 12: case 13:
57 57
 				// Add Dark Prismarine Pylons.
58 58
 				for (int l =  8; l < 11; l++) {
59 59
 					WD.set(aChunk, i  , j+l, k  , BlocksGT.PrismarineDark, 0);
@@ -72,7 +72,7 @@ public class WorldgenDeepOcean extends WorldgenObject {
72 72
 					WD.set(aChunk, i+m, j-l, k+n, BlocksGT.PrismarineDark, 0);
73 73
 				}
74 74
 				return T;
75
-			case 13: case 14: case 15:
75
+			case 14: case 15:
76 76
 				// Add Light Prismarine Pylons.
77 77
 				for (int l =  8; l < 11; l++) {
78 78
 					WD.set(aChunk, i  , j+l, k  , BlocksGT.PrismarineLight, 0);

Loading…
Cancel
Save