Skip to content

Commit

Permalink
Initial Inventory Holder - Block, Container, screen, BE, Slots, etc
Browse files Browse the repository at this point in the history
  • Loading branch information
Direwolf20-MC committed Sep 7, 2024
1 parent c3a9ba7 commit 40f285b
Show file tree
Hide file tree
Showing 32 changed files with 494 additions and 23 deletions.
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// 1.21.1 2024-09-01T22:20:42.6000571 JustDireThings Tags
// 1.21.1 2024-09-07T12:06:42.2453493 JustDireThings Tags
3f1af1854f73f0ca55ec9d76439efe025d53baaf data/c/tags/block/budding_blocks.json
f9398184c0216b0a1898a13ab326b459417ec790 data/c/tags/block/buds.json
691444261459e5b538067e8cd03db2fbe1b3371d data/c/tags/block/clusters.json
Expand All @@ -13,5 +13,5 @@ fd8f34ea7c3f46b4031a8323009cfaffab88474e data/justdirethings/tags/block/phase_de
b73bf681aa4023a1ac69623485bbec13846a282a data/justdirethings/tags/block/swapper_deny.json
35133e95f1c8fdd7a1c21afcc231fc0bffefb9a8 data/justdirethings/tags/block/tick_speed_deny.json
704d4386b02b3ad86131bd6cf1e36461baa4169f data/minecraft/tags/block/bamboo_plantable_on.json
b582d1714a5139e7e456eb8708c9adcace275e37 data/minecraft/tags/block/mineable/pickaxe.json
0562efff705455227cd6342808df3c8f082d9cbc data/minecraft/tags/block/mineable/pickaxe.json
8882a0a52d428036a957d24fb046777a8795e588 data/minecraft/tags/block/mineable/shovel.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// 1.21.1 2024-08-25T12:11:24.2452257 Loot Tables
// 1.21.1 2024-09-07T12:06:42.2583603 Loot Tables
16a0ab61513717ab1cb8c1df9718722a643d9728 data/justdirethings/loot_table/blocks/blazegold_block.json
b2953e2dcd4960e7f275bb42e4ad626219213fe1 data/justdirethings/loot_table/blocks/blockbreakert1.json
bb65fdba3c1b14526a629aacb462661b5853008b data/justdirethings/loot_table/blocks/blockbreakert2.json
Expand Down Expand Up @@ -34,6 +34,7 @@ ec24d4e64ad8c73bb13ad3153e02193c0c4e286d data/justdirethings/loot_table/blocks/g
dbc0b95e979a373cff9226804660f79e55dead0b data/justdirethings/loot_table/blocks/goosoil_tier2.json
e5dc519a36800fe39f9b40f5e1d912d9df6f7c3b data/justdirethings/loot_table/blocks/goosoil_tier3.json
7d4fef11b44bce90cb85c09d118d03c23521e5cb data/justdirethings/loot_table/blocks/goosoil_tier4.json
749b820e9b4fdd786aa8178d7dbf768e033e0206 data/justdirethings/loot_table/blocks/inventory_holder.json
ef34320ffe3a06c2453936f1b1e64b1d0a15236a data/justdirethings/loot_table/blocks/itemcollector.json
6b7915b45c6c11b54c9b87c99d2fc57fcdf6c11b data/justdirethings/loot_table/blocks/paradoxmachine.json
e6928ebd9466d9024405cfea4dc9fd49c4a1dc4f data/justdirethings/loot_table/blocks/playeraccessor.json
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// 1.21.1 2024-08-25T12:11:24.2347167 Item Models: justdirethings
// 1.21.1 2024-09-07T12:06:42.2473509 Item Models: justdirethings
c197a1b2a5ae31fcfabfe6cab9ab95a9dc0e1af6 assets/justdirethings/models/item/blazegold_axe.json
dddf215922d40d92c2d8bce4229f2e2af8b3c7ba assets/justdirethings/models/item/blazegold_axe_active.json
6396fb6e503760080534bc26337236d4d09a4cb8 assets/justdirethings/models/item/blazegold_block.json
Expand Down Expand Up @@ -281,6 +281,7 @@ a48cecdb5ad78ee95ffb4e98458804d64cd1f608 assets/justdirethings/models/item/gooso
d42f004ad7ff6b67416aa3265ce45f6c3ec717f4 assets/justdirethings/models/item/goosoil_tier2.json
e4ec28bbb693fef607a9a59e130c9c741c2c4ec2 assets/justdirethings/models/item/goosoil_tier3.json
ac932db480bd510a82b5f207cc05152877106e2e assets/justdirethings/models/item/goosoil_tier4.json
913e08f666fffaf8a1801f9049ad8e63b3003391 assets/justdirethings/models/item/inventory_holder.json
87ad4ff946b952807517ec6ef4b434215dc6fb51 assets/justdirethings/models/item/itemcollector.json
19238cd33f307548ea99478a3b2e554a575d1a90 assets/justdirethings/models/item/machinesettingscopier.json
93289cdb69e1b67bf43186e5ad12efafcb01149e assets/justdirethings/models/item/paradoxmachine.json
Expand Down
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
// 1.21.1 2024-09-01T15:37:32.1392333 Languages: en_us for mod: justdirethings
78042fa2f9773924a9bb3a1d423d217d7d0ffe24 assets/justdirethings/lang/en_us.json
// 1.21.1 2024-09-07T12:06:42.2578596 Languages: en_us for mod: justdirethings
f1acf5d5f9467ec76be0998022390a8140f7c459 assets/justdirethings/lang/en_us.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// 1.21.1 2024-09-01T16:57:19.9701478 Recipes
// 1.21.1 2024-09-07T12:06:42.2598615 Recipes
39cd44c838de7f56aeac73aec8b3bfb64ad7fec2 data/justdirethings/advancement/recipes/building_blocks/blazegold_ingot_9x9.json
2f2a0f948f272df9713010dbcb75beb81c328b01 data/justdirethings/advancement/recipes/building_blocks/celestigem_9x9.json
94b1a5fa365caea5ec90b525346091c5babe3068 data/justdirethings/advancement/recipes/building_blocks/coal_t1_9x9.json
Expand Down Expand Up @@ -290,6 +290,8 @@ cf4c8ec4d15c74eedcb190186c22deb10f488310 data/justdirethings/advancement/recipes
14618bd6c1ceecf67c813fdc403ee01b972178f0 data/justdirethings/advancement/recipes/misc/gooblock_tier2.json
f965796d5be85d63ad61a862e9e7819d4c6a8a68 data/justdirethings/advancement/recipes/misc/gooblock_tier3.json
fdebc5b40b207807304f336cf17a8e3a43b01d66 data/justdirethings/advancement/recipes/misc/gooblock_tier4.json
8c779d43a5c51115bf13c22fbd9c00230837fa05 data/justdirethings/advancement/recipes/misc/inventory_holder.json
1b645d86c2a7c9b93dcffbbbbeecb83a8bcff955 data/justdirethings/advancement/recipes/misc/inventory_holder_nbtclear.json
e10812b6725eb2ece42eaa4153f759a8b6c0afed data/justdirethings/advancement/recipes/misc/itemcollector.json
6c3ff48d510d379f907fd43b1da46f37e87f7b6a data/justdirethings/advancement/recipes/misc/itemcollector_nbtclear.json
3c0f94c52d98fa71451b71aa1ad0b01e295712a0 data/justdirethings/advancement/recipes/misc/machinesettingscopier.json
Expand Down Expand Up @@ -669,6 +671,8 @@ ad727ee779884e18264f5460103c78f8c0ac283a data/justdirethings/recipe/generatort1.
b6bf47c9ad5cd5b8dd2436966c94ebea194bdfb9 data/justdirethings/recipe/gooblock_tier2.json
115913ff475c95e246dad1785bb2a581182fa4a1 data/justdirethings/recipe/gooblock_tier3.json
e3990dbefb4f17cf3a84f6ef65168524adc0e543 data/justdirethings/recipe/gooblock_tier4.json
8dc38c0ef2cfa634588b26f958818640fee86232 data/justdirethings/recipe/inventory_holder.json
441b9cbf896a63bda07b360d2a39658f69bf44ad data/justdirethings/recipe/inventory_holder_nbtclear.json
4d63f24946629911b30e62e200beb6c75fd033ee data/justdirethings/recipe/itemcollector.json
2827bca3da58aebda20b9fb5c572cb9252c40e7a data/justdirethings/recipe/itemcollector_nbtclear.json
748448f660b8991e9407f8a14ab645234b91a398 data/justdirethings/recipe/machinesettingscopier.json
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// 1.21.1 2024-08-25T12:11:24.2422233 Block States: justdirethings
// 1.21.1 2024-09-07T12:06:42.2548566 Block States: justdirethings
e5976480ed9485e0bae43d4edde0c8aecaabe8a5 assets/justdirethings/blockstates/blazegold_block.json
6580258682ab076313135ecb0c16dc2595a1a0df assets/justdirethings/blockstates/blockbreakert1.json
0db1a53fd80ee5aed746843da439bd30b131ac55 assets/justdirethings/blockstates/blockbreakert2.json
Expand Down Expand Up @@ -31,6 +31,7 @@ eb64574ddf30848ca3e6290c1ebb8029f8513c15 assets/justdirethings/blockstates/goobl
f221904a483d33a577cfa1060d4b8f9063e2812e assets/justdirethings/blockstates/goosoil_tier2.json
d550876437faefc69e5ad8ef174f472d7f89369c assets/justdirethings/blockstates/goosoil_tier3.json
9c77898649f8529c0343218f178d522014585e89 assets/justdirethings/blockstates/goosoil_tier4.json
e9406a0020776051de726313d9d08f8fe8f841bf assets/justdirethings/blockstates/inventory_holder.json
656ee182206c56461dc90f6d13082d6dfbab1298 assets/justdirethings/blockstates/paradoxmachine.json
420242c724ce8c4dcadd2e61d8cef10cdaf261f6 assets/justdirethings/blockstates/playeraccessor.json
b59fd6f494e8c21421ddf11d645c261348d7f3d6 assets/justdirethings/blockstates/polymorphic_fluid_block.json
Expand Down Expand Up @@ -103,6 +104,7 @@ c90ce24d043ec38a46ebf2a3e90e37ae5672a837 assets/justdirethings/models/block/goos
4e6ddba47a2ceb2876916550d64ab7bfe709f8eb assets/justdirethings/models/block/goosoil_tier3_moist.json
dea2d948b32322a5aeb424c534c2a5ec2e952975 assets/justdirethings/models/block/goosoil_tier4.json
543cb7bee8f16de42651f69263a2799b4ce54c15 assets/justdirethings/models/block/goosoil_tier4_moist.json
aeae2fff448b79edebfc6be420af80c1536ca07f assets/justdirethings/models/block/inventory_holder.json
2903e942696ee1ec912f4d23944c7f60671fe8dd assets/justdirethings/models/block/paradoxmachine.json
afb260733f29a4754b2282eb26b78af1a2940bcd assets/justdirethings/models/block/playeraccessor.json
4cbb3c8e0147ca797cb922394a58a3950e00ffef assets/justdirethings/models/block/polymorphic_fluid_block.json
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"variants": {
"": {
"model": "justdirethings:block/inventory_holder"
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@
"block.justdirethings.goosoil_tier2": "Blazebloom Soil",
"block.justdirethings.goosoil_tier3": "VoidShimmer Soil",
"block.justdirethings.goosoil_tier4": "Shadowpulse Soil",
"block.justdirethings.inventory_holder": "Inventory Holder",
"block.justdirethings.itemcollector": "Item Collector",
"block.justdirethings.paradoxmachine": "Paradox Machine",
"block.justdirethings.playeraccessor": "Player Accessor",
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "minecraft:block/cube_all",
"textures": {
"all": "justdirethings:block/inventory_holder"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"parent": "justdirethings:block/inventory_holder"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
{
"parent": "minecraft:recipes/root",
"criteria": {
"has_blazegold_ingot": {
"conditions": {
"items": [
{
"items": "justdirethings:blazegold_ingot"
}
]
},
"trigger": "minecraft:inventory_changed"
},
"has_the_recipe": {
"conditions": {
"recipe": "justdirethings:inventory_holder"
},
"trigger": "minecraft:recipe_unlocked"
}
},
"requirements": [
[
"has_the_recipe",
"has_blazegold_ingot"
]
],
"rewards": {
"recipes": [
"justdirethings:inventory_holder"
]
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
{
"parent": "minecraft:recipes/root",
"criteria": {
"has_inventory_holder": {
"conditions": {
"items": [
{
"items": "justdirethings:inventory_holder"
}
]
},
"trigger": "minecraft:inventory_changed"
},
"has_the_recipe": {
"conditions": {
"recipe": "justdirethings:inventory_holder_nbtclear"
},
"trigger": "minecraft:recipe_unlocked"
}
},
"requirements": [
[
"has_the_recipe",
"has_inventory_holder"
]
],
"rewards": {
"recipes": [
"justdirethings:inventory_holder_nbtclear"
]
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
{
"type": "minecraft:block",
"pools": [
{
"bonus_rolls": 0.0,
"conditions": [
{
"condition": "minecraft:survives_explosion"
}
],
"entries": [
{
"type": "minecraft:item",
"name": "justdirethings:inventory_holder"
}
],
"rolls": 1.0
}
],
"random_sequence": "justdirethings:blocks/inventory_holder"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
{
"type": "minecraft:crafting_shaped",
"category": "misc",
"group": "justdirethings",
"key": {
"f": {
"item": "justdirethings:blazegold_ingot"
},
"o": {
"item": "minecraft:armor_stand"
}
},
"pattern": [
" f ",
"fof",
" f "
],
"result": {
"count": 1,
"id": "justdirethings:inventory_holder"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
{
"type": "minecraft:crafting_shapeless",
"category": "misc",
"group": "justdirethings",
"ingredients": [
{
"item": "justdirethings:inventory_holder"
}
],
"result": {
"count": 1,
"id": "justdirethings:inventory_holder"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@
"justdirethings:fluidcollectort2",
"justdirethings:time_crystal_cluster",
"justdirethings:time_crystal_block",
"justdirethings:paradoxmachine"
"justdirethings:paradoxmachine",
"justdirethings:inventory_holder"
]
}
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,8 @@ public boolean canFillFluidType(FluidStack fluid) {
Registration.FluidPlacerT1.get(),
Registration.FluidPlacerT2.get(),
Registration.FluidCollectorT1.get(),
Registration.FluidCollectorT2.get()
Registration.FluidCollectorT2.get(),
Registration.InventoryHolder.get()
);
event.registerBlock(Capabilities.ItemHandler.BLOCK,
(level, pos, state, be, side) -> {
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
package com.direwolf20.justdirethings.client.screens;

import com.direwolf20.justdirethings.client.screens.basescreens.BaseMachineScreen;
import com.direwolf20.justdirethings.common.blockentities.InventoryHolderBE;
import com.direwolf20.justdirethings.common.containers.InventoryHolderContainer;
import net.minecraft.client.gui.GuiGraphics;
import net.minecraft.network.chat.Component;
import net.minecraft.world.entity.player.Inventory;

public class InventoryHolderScreen extends BaseMachineScreen<InventoryHolderContainer> {
InventoryHolderBE inventoryHolderBE;

public InventoryHolderScreen(InventoryHolderContainer container, Inventory inv, Component name) {
super(container, inv, name);
if (container.baseMachineBE instanceof InventoryHolderBE inventoryHolderBE) {
this.inventoryHolderBE = inventoryHolderBE;
}
}

@Override
public void addTickSpeedButton() {
//No-Op
}

@Override
public void init() {
super.init();
}

@Override
public void setTopSection() {
extraWidth = 0;
extraHeight = 24;
}

@Override
protected void renderLabels(GuiGraphics guiGraphics, int mouseX, int mouseY) {
super.renderLabels(guiGraphics, mouseX, mouseY);
}

@Override
public void saveSettings() {
super.saveSettings();
}

public void renderInventorySection(GuiGraphics guiGraphics, int relX, int relY) {
guiGraphics.blitSprite(SOCIALBACKGROUND, relX, relY + 83 - 8, this.imageWidth, this.imageHeight - 55); //Inventory Section
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -265,6 +265,10 @@ protected void drawBasicSlot(GuiGraphics guiGraphics, Slot slot) {
guiGraphics.blit(JUSTSLOT, getGuiLeft() + slot.x - 1, getGuiTop() + slot.y - 1, 0, 0, 18, 18);
}

public void renderInventorySection(GuiGraphics guiGraphics, int relX, int relY) {
guiGraphics.blitSprite(SOCIALBACKGROUND, relX, relY + 83 - 8, this.imageWidth, this.imageHeight - 73); //Inventory Section
}

@Override
protected void renderBg(GuiGraphics guiGraphics, float partialTicks, int mouseX, int mouseY) {
int relX = (this.width - this.imageWidth) / 2;
Expand All @@ -273,7 +277,7 @@ protected void renderBg(GuiGraphics guiGraphics, float partialTicks, int mouseX,
guiGraphics.blitSprite(SOCIALBACKGROUND, topSectionLeft + 20, topSectionTop - 20, topSectionWidth - 40, 20);
RenderSystem.setShaderColor(1f, 1f, 1f, 1f);
guiGraphics.blitSprite(SOCIALBACKGROUND, topSectionLeft, topSectionTop, topSectionWidth, topSectionHeight);
guiGraphics.blitSprite(SOCIALBACKGROUND, relX, relY + 83 - 8, this.imageWidth, this.imageHeight - 73); //Inventory Section
renderInventorySection(guiGraphics, relX, relY);
for (Slot slot : container.slots) {
drawSlot(guiGraphics, slot);
}
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
package com.direwolf20.justdirethings.common.blockentities;

import com.direwolf20.justdirethings.common.blockentities.basebe.BaseMachineBE;
import com.direwolf20.justdirethings.setup.Registration;
import net.minecraft.core.BlockPos;
import net.minecraft.core.HolderLookup;
import net.minecraft.nbt.CompoundTag;
import net.minecraft.world.level.block.entity.BlockEntityType;
import net.minecraft.world.level.block.state.BlockState;

public class InventoryHolderBE extends BaseMachineBE {
public InventoryHolderBE(BlockEntityType<?> pType, BlockPos pPos, BlockState pBlockState) {
super(pType, pPos, pBlockState);
}

public InventoryHolderBE(BlockPos pPos, BlockState pBlockState) {
this(Registration.InventoryHolderBE.get(), pPos, pBlockState);
}

@Override
public boolean isDefaultSettings() {
return true;
}

@Override
public void saveAdditional(CompoundTag tag, HolderLookup.Provider provider) {
super.saveAdditional(tag, provider);
}

@Override
public void loadAdditional(CompoundTag tag, HolderLookup.Provider provider) {

super.loadAdditional(tag, provider);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ public class BaseMachineBE extends BlockEntity {

public BaseMachineBE(BlockEntityType<?> pType, BlockPos pPos, BlockState pBlockState) {
super(pType, pPos, pBlockState);
MACHINE_SLOTS = 41; //Hotbar, Inventory, Armor, and Offhand
}

public void tickClient() {
Expand Down
Loading

0 comments on commit 40f285b

Please sign in to comment.