MinecraftMods/EngineersDecor
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

1.12: Creative tab opt-out handling added (issue #90). 1.14/1.15: Dev snapshot.

Browse source
This commit is contained in:
stfwi 2020-02-24 20:49:44 +01:00
parent 22b8d53f6e
commit adc0df9d47
14 changed files with 95 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

2
1.15/gradle.properties
View file

@ -5,4 +5,4 @@ version_minecraft=1.15.2
version_forge_minecraft=1.15.2-31.1.1
version_fml_mappings=20191105-1.14.3
version_jei=1.15.2:6.0.0.2
version_engineersdecor=1.0.19-b4
version_engineersdecor=1.0.19-b5

4
1.15/readme.md
View file

@ -11,6 +11,10 @@ Mod sources for Minecraft version 1.15.1.
## Version history
~ v1.0.19-b5 [A] Factory Hopper: Resetting NBT when breaking with empty inventory (for stacking), enabled
item cap for all sides.
[A] Mod manual 1st edition release recipe added.
- v1.0.19-b4 [A] Ported primary Immersive Engineering dependent recipes (alternative recipes
will still work if IE is not installed).
[F] Blacklisted Treated Wood Crafting Table in inventorysorter mod (issue #88, thx Nachtflame).

11
1.15/src/main/java/wile/engineersdecor/blocks/BlockDecorHopper.java
View file

@ -226,9 +226,11 @@ public class BlockDecorHopper extends BlockDecor.Directed implements IDecorBlock
CompoundNBT nbt = new CompoundNBT();
block_power_signal_ = false;
writenbt(nbt, false);
for(int i=0; i<stacks_.size(); ++i) stacks_.set(i, ItemStack.EMPTY);
boolean is_empty = true;
for(int i=0; i<stacks_.size(); ++i) { is_empty &= stacks_.get(i).isEmpty(); stacks_.set(i, ItemStack.EMPTY); }
reset_rtstate();
block_power_updated_ = false;
if(is_empty) nbt = new CompoundNBT();
return nbt;
}
@ -397,7 +399,7 @@ public class BlockDecorHopper extends BlockDecor.Directed implements IDecorBlock
// ISidedInventory --------------------------------------------------------------------------------------
LazyOptional<? extends IItemHandler>[] item_handlers = SidedInvWrapper.create(this, Direction.UP, Direction.DOWN);
LazyOptional<? extends IItemHandler>[] item_handlers = SidedInvWrapper.create(this, Direction.UP);
private static final int[] SIDED_INV_SLOTS;
static {
SIDED_INV_SLOTS = new int[NUM_OF_SLOTS];
@ -422,10 +424,7 @@ public class BlockDecorHopper extends BlockDecor.Directed implements IDecorBlock
public <T> LazyOptional<T> getCapability(net.minecraftforge.common.capabilities.Capability<T> capability, @Nullable Direction facing)
{
if(!this.removed && (facing != null)) {
if(capability==CapabilityItemHandler.ITEM_HANDLER_CAPABILITY) {
if(facing == Direction.UP) return item_handlers[0].cast();
if(facing == Direction.DOWN) return item_handlers[1].cast();
}
if(capability==CapabilityItemHandler.ITEM_HANDLER_CAPABILITY) return item_handlers[0].cast();
}
return super.getCapability(capability, facing);
}

22
1.15/src/main/resources/data/engineersdecor/recipes/independent/engineersdecor_manual_recipe.json Normal file
View file

@ -0,0 +1,22 @@
{
"conditions": [
{
"type": "engineersdecor:optional",
"result": "patchouli:guide_book",
"required": ["minecraft:iron_nugget", "minecraft:book"]
}
],
"type": "minecraft:crafting_shaped",
"pattern": [
"BN",
"N "
],
"key": {
"B": { "item": "minecraft:book" },
"N": { "item": "minecraft:iron_nugget" }
},
"result": {
"item": "patchouli:guide_book",
"nbt": { "patchouli:book": "engineersdecor:engineersdecor_manual" }
}
}