Skip to content

Commit 7ebd80f

Browse files
committed
+ Try to fix #54
1 parent 428f277 commit 7ebd80f

File tree

5 files changed

+22
-7
lines changed

5 files changed

+22
-7
lines changed

CHANGELOG.md

+3
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
# 1.4
2+
+ Fix [#54](https://github.com/Buuz135/Industrial-Foregoing/issues/54)
3+
14
# 1.3.1
25
+ Changed some names
36
+ Improved ItemStack handling of the Black Hole Unit a lot. Closes [#51](https://github.com/Buuz135/Industrial-Foregoing/issues/51)

ISSUE_TEMPLATE.md

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
Industrial Foregoing Version:
2+
TeslaCoreLib Version:
3+
Crashlog (If Any):

gradle.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Sets default memory used for gradle commands. Can be overridden by user or command line properties.
22
# This is required to provide enough memory for the Minecraft decompilation process.
33
org.gradle.jvmargs=-Xmx3G
4-
mod_version=1.3.1
4+
mod_version=1.4
55
minecraft_version=1.12
66
tesla_core_version=1.0.9
77
tesla_version=1.0.60

src/main/java/com/buuz135/industrial/tile/world/LaserBaseTile.java

+14-5
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
import com.buuz135.industrial.proxy.client.infopiece.LaserBaseInfoPiece;
77
import com.buuz135.industrial.tile.CustomColoredItemHandler;
88
import com.buuz135.industrial.tile.CustomSidedTileEntity;
9-
import com.buuz135.industrial.tile.block.LaserBaseBlock;
109
import com.buuz135.industrial.utils.ItemStackWeightedItem;
1110
import net.minecraft.item.EnumDyeColor;
1211
import net.minecraft.item.ItemStack;
@@ -57,13 +56,13 @@ public boolean canExtractItem(int slot) {
5756
});
5857
this.addInventoryToStorage(lensItems, "lensItems");
5958

60-
outItems = new ItemStackHandler(3 * 5) {
59+
outItems = new ItemStackHandler(3 * 6) {
6160
@Override
6261
protected void onContentsChanged(int slot) {
6362
LaserBaseTile.this.markDirty();
6463
}
6564
};
66-
this.addInventory(new CustomColoredItemHandler(outItems, EnumDyeColor.ORANGE, "Output items", 18 * 4 + 6, 25, 5, 3) {
65+
this.addInventory(new CustomColoredItemHandler(outItems, EnumDyeColor.ORANGE, "Output items", 18 * 4 + 6, 25, 6, 3) {
6766
@Override
6867
public boolean canInsertItem(int slot, ItemStack stack) {
6968
return false;
@@ -127,16 +126,26 @@ public int getCurrentWork() {
127126
}
128127

129128
public int getMaxWork() {
130-
return ((LaserBaseBlock) this.getBlockType()).getWorkNeeded();
129+
return BlockRegistry.laserBaseBlock.getWorkNeeded();
131130
}
132131

133132
public void increaseWork() {
134-
partialSync(NBT_CURRENT, true);
135133
++currentWork;
134+
partialSync(NBT_CURRENT, true);
136135
}
137136

138137
@Override
139138
protected boolean getShowPauseDrawerPiece() {
140139
return false;
141140
}
141+
142+
@Override
143+
protected boolean getShowRedstoneControlPiece() {
144+
return false;
145+
}
146+
147+
@Override
148+
protected boolean supportsAddons() {
149+
return false;
150+
}
142151
}

src/main/resources/assets/industrialforegoing/lang/en_US.lang

+1-1
Original file line numberDiff line numberDiff line change
@@ -114,4 +114,4 @@ gui.industrialforegoing.side_config.villager_mob_imprisonment_tool=Villager Mob
114114
gui.industrialforegoing.side_config.trade_input=Trade Input
115115
gui.industrialforegoing.side_config.trade_output=Trade Output
116116
gui.industrialforegoing.side_config.dye_items=Dye Items
117-
gui.industrialforegoing.side_config.lens_item=Lens Item
117+
gui.industrialforegoing.side_config.lens_items=Lens Items

0 commit comments

Comments
 (0)