From e9b5c7f8137515604c686b0862c90bf10a146954 Mon Sep 17 00:00:00 2001 From: Flanks255 <32142731+Flanks255@users.noreply.github.com> Date: Sat, 30 Nov 2024 14:29:18 -0600 Subject: [PATCH] Removed the skeleton of the Crate, per Ell --- .../59eb3dbb5f86130e09b3c62d89b9525ee01cf52d | 3 +- .../b3ca5dca15f867120b82824364d3156b7fdfd666 | 3 +- .../models/item/crate_small.json | 3 - .../loot_table/blocks/crate_small.json | 21 ------- .../data/LootTableGenerator.java | 1 - .../mod/blocks/ActuallyBlocks.java | 57 ++----------------- .../actuallyadditions/mod/blocks/Crate.java | 2 + .../actuallyadditions/mod/tile/CrateBE.java | 2 + .../mod/util/CrateItemHandler.java | 2 + 9 files changed, 12 insertions(+), 82 deletions(-) delete mode 100644 src/generated/resources/assets/actuallyadditions/models/item/crate_small.json delete mode 100644 src/generated/resources/data/actuallyadditions/loot_table/blocks/crate_small.json diff --git a/src/generated/resources/.cache/59eb3dbb5f86130e09b3c62d89b9525ee01cf52d b/src/generated/resources/.cache/59eb3dbb5f86130e09b3c62d89b9525ee01cf52d index 51455fa6f..db93f64b8 100644 --- a/src/generated/resources/.cache/59eb3dbb5f86130e09b3c62d89b9525ee01cf52d +++ b/src/generated/resources/.cache/59eb3dbb5f86130e09b3c62d89b9525ee01cf52d @@ -1,4 +1,4 @@ -// 1.21.1 2024-11-06T16:28:35.7516904 Loot Tables +// 1.21.1 2024-11-30T14:28:45.6232631 Loot Tables ef11aa79a2f96a47250f46811f8491fd34d627f9 data/actuallyadditions/loot_table/blocks/atomic_reconstructor.json e15c868b26b669c30365bfb93e7d9274e07df16d data/actuallyadditions/loot_table/blocks/battery_box.json 745d64af3b0203a138f9eca7de21ed4988b35c95 data/actuallyadditions/loot_table/blocks/bio_reactor.json @@ -25,7 +25,6 @@ b598ece027ef00e9ed0457a7f9542ebe8b89538c data/actuallyadditions/loot_table/block 7d23a0c906af2f6b3fecaba91f776385db5a50bc data/actuallyadditions/loot_table/blocks/coal_generator.json afab93747299dba6783292e5949ea7e0cd5d5b13 data/actuallyadditions/loot_table/blocks/coffee.json 3d8c1c296df957964e41065f4d2c0814eee29282 data/actuallyadditions/loot_table/blocks/coffee_machine.json -fa895b25a0816ca506f7031ec3861cfd4de04f28 data/actuallyadditions/loot_table/blocks/crate_small.json 7c7a4028f6fe02446d1557f72ad494ab363a8409 data/actuallyadditions/loot_table/blocks/crusher.json cbd5456165eaf299685aab50dc3bce38d99a1cf8 data/actuallyadditions/loot_table/blocks/crusher_double.json 25b7a44418e2858552dd5150d67bffe1f30269a8 data/actuallyadditions/loot_table/blocks/diamatine_crystal_block.json diff --git a/src/generated/resources/.cache/b3ca5dca15f867120b82824364d3156b7fdfd666 b/src/generated/resources/.cache/b3ca5dca15f867120b82824364d3156b7fdfd666 index 01445df12..154286de6 100644 --- a/src/generated/resources/.cache/b3ca5dca15f867120b82824364d3156b7fdfd666 +++ b/src/generated/resources/.cache/b3ca5dca15f867120b82824364d3156b7fdfd666 @@ -1,4 +1,4 @@ -// 1.21.1 2024-08-11T19:30:01.826318 Item Models: actuallyadditions +// 1.21.1 2024-11-30T14:28:45.6304493 Item Models: actuallyadditions 34463d3d2ae3fafaaea338e7ffc03cd139d3cfeb assets/actuallyadditions/models/item/advanced_coil.json 24594fc68e66011dc2d7b79b92c94b387e710318 assets/actuallyadditions/models/item/advanced_leaf_blower.json ba2d814e269cdef72e1045f200b3c20ed6961517 assets/actuallyadditions/models/item/atomic_reconstructor.json @@ -37,7 +37,6 @@ c73981382d646e4a0186b26fcfad817d39252055 assets/actuallyadditions/models/item/ch a67f1795e1ad1d6ed19f2a35f176f39e00dbb9c3 assets/actuallyadditions/models/item/coffee_machine.json 523148eac33929fb0d2892856a5ddcb784043bb5 assets/actuallyadditions/models/item/crafter_on_a_stick.json 89cc79420e3a7c2952ce729537b7503a517bb9de assets/actuallyadditions/models/item/crate_keeper.json -cfc7022ad26717b33c916d380435cc32ace34c0b assets/actuallyadditions/models/item/crate_small.json 9bc734dadf9d5b85b8cc5685b673a1d074cf3d6d assets/actuallyadditions/models/item/crusher.json 4b7ef5dd15d930d4b0b5507cd08c27cb5ee1498a assets/actuallyadditions/models/item/crusher_double.json 91e18e2c5ae8f657b977865312e8cd7ee348d8f1 assets/actuallyadditions/models/item/crystallized_canola_seed.json diff --git a/src/generated/resources/assets/actuallyadditions/models/item/crate_small.json b/src/generated/resources/assets/actuallyadditions/models/item/crate_small.json deleted file mode 100644 index e53ea610d..000000000 --- a/src/generated/resources/assets/actuallyadditions/models/item/crate_small.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "actuallyadditions:block/crate_small" -} \ No newline at end of file diff --git a/src/generated/resources/data/actuallyadditions/loot_table/blocks/crate_small.json b/src/generated/resources/data/actuallyadditions/loot_table/blocks/crate_small.json deleted file mode 100644 index 61b9919ba..000000000 --- a/src/generated/resources/data/actuallyadditions/loot_table/blocks/crate_small.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "bonus_rolls": 0.0, - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ], - "entries": [ - { - "type": "minecraft:item", - "name": "actuallyadditions:crate_small" - } - ], - "rolls": 1.0 - } - ], - "random_sequence": "actuallyadditions:blocks/crate_small" -} \ No newline at end of file diff --git a/src/main/java/de/ellpeck/actuallyadditions/data/LootTableGenerator.java b/src/main/java/de/ellpeck/actuallyadditions/data/LootTableGenerator.java index d7a089b63..bbcaa0345 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/data/LootTableGenerator.java +++ b/src/main/java/de/ellpeck/actuallyadditions/data/LootTableGenerator.java @@ -117,7 +117,6 @@ public class LootTableGenerator extends LootTableProvider { this.dropSelf(ActuallyBlocks.FEEDER.get()); this.dropSelf(ActuallyBlocks.HEAT_COLLECTOR.get()); this.dropSelf(ActuallyBlocks.GREENHOUSE_GLASS.get()); - this.dropSelf(ActuallyBlocks.CRATE_SMALL.get()); this.dropSelf(ActuallyBlocks.PHANTOM_BOOSTER.get()); this.dropSelf(ActuallyBlocks.RANGED_COLLECTOR.get()); this.dropSelf(ActuallyBlocks.LONG_RANGE_BREAKER.get()); diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/ActuallyBlocks.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/ActuallyBlocks.java index bbecec629..af0402240 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/ActuallyBlocks.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/ActuallyBlocks.java @@ -14,62 +14,11 @@ import de.ellpeck.actuallyadditions.mod.ActuallyAdditions; import de.ellpeck.actuallyadditions.mod.blocks.base.AACrops; import de.ellpeck.actuallyadditions.mod.items.ActuallyItems; import de.ellpeck.actuallyadditions.mod.items.metalists.Crystals; -import de.ellpeck.actuallyadditions.mod.tile.CrateBE; -import de.ellpeck.actuallyadditions.mod.tile.TileEntityAtomicReconstructor; -import de.ellpeck.actuallyadditions.mod.tile.TileEntityBase; -import de.ellpeck.actuallyadditions.mod.tile.TileEntityBatteryBox; -import de.ellpeck.actuallyadditions.mod.tile.TileEntityBioReactor; -import de.ellpeck.actuallyadditions.mod.tile.TileEntityBreaker; -import de.ellpeck.actuallyadditions.mod.tile.TileEntityCanolaPress; -import de.ellpeck.actuallyadditions.mod.tile.TileEntityCoalGenerator; -import de.ellpeck.actuallyadditions.mod.tile.TileEntityCoffeeMachine; -import de.ellpeck.actuallyadditions.mod.tile.TileEntityCrusher; -import de.ellpeck.actuallyadditions.mod.tile.TileEntityCrusherDouble; -import de.ellpeck.actuallyadditions.mod.tile.TileEntityDisplayStand; -import de.ellpeck.actuallyadditions.mod.tile.TileEntityDropper; -import de.ellpeck.actuallyadditions.mod.tile.TileEntityEmpowerer; -import de.ellpeck.actuallyadditions.mod.tile.TileEntityEnergizer; -import de.ellpeck.actuallyadditions.mod.tile.TileEntityEnervator; -import de.ellpeck.actuallyadditions.mod.tile.TileEntityFarmer; -import de.ellpeck.actuallyadditions.mod.tile.TileEntityFeeder; -import de.ellpeck.actuallyadditions.mod.tile.TileEntityFermentingBarrel; -import de.ellpeck.actuallyadditions.mod.tile.TileEntityFireworkBox; -import de.ellpeck.actuallyadditions.mod.tile.TileEntityFluidCollector; -import de.ellpeck.actuallyadditions.mod.tile.TileEntityFluidPlacer; -import de.ellpeck.actuallyadditions.mod.tile.TileEntityHeatCollector; -import de.ellpeck.actuallyadditions.mod.tile.TileEntityItemInterface; -import de.ellpeck.actuallyadditions.mod.tile.TileEntityItemInterfaceHopping; -import de.ellpeck.actuallyadditions.mod.tile.TileEntityLaserRelayEnergy; -import de.ellpeck.actuallyadditions.mod.tile.TileEntityLaserRelayEnergyAdvanced; -import de.ellpeck.actuallyadditions.mod.tile.TileEntityLaserRelayEnergyExtreme; -import de.ellpeck.actuallyadditions.mod.tile.TileEntityLaserRelayFluids; -import de.ellpeck.actuallyadditions.mod.tile.TileEntityLaserRelayItem; -import de.ellpeck.actuallyadditions.mod.tile.TileEntityLaserRelayItemAdvanced; -import de.ellpeck.actuallyadditions.mod.tile.TileEntityLavaFactoryController; -import de.ellpeck.actuallyadditions.mod.tile.TileEntityLeafGenerator; -import de.ellpeck.actuallyadditions.mod.tile.TileEntityLongRangeBreaker; -import de.ellpeck.actuallyadditions.mod.tile.TileEntityOilGenerator; -import de.ellpeck.actuallyadditions.mod.tile.TileEntityPhantomBreaker; -import de.ellpeck.actuallyadditions.mod.tile.TileEntityPhantomEnergyface; -import de.ellpeck.actuallyadditions.mod.tile.TileEntityPhantomItemface; -import de.ellpeck.actuallyadditions.mod.tile.TileEntityPhantomLiquiface; -import de.ellpeck.actuallyadditions.mod.tile.TileEntityPhantomPlacer; -import de.ellpeck.actuallyadditions.mod.tile.TileEntityPhantomRedstoneface; -import de.ellpeck.actuallyadditions.mod.tile.TileEntityPlacer; -import de.ellpeck.actuallyadditions.mod.tile.TileEntityPlayerInterface; -import de.ellpeck.actuallyadditions.mod.tile.TileEntityPoweredFurnace; -import de.ellpeck.actuallyadditions.mod.tile.TileEntityRangedCollector; -import de.ellpeck.actuallyadditions.mod.tile.TileEntityShockSuppressor; -import de.ellpeck.actuallyadditions.mod.tile.TileEntityVerticalDigger; -import de.ellpeck.actuallyadditions.mod.tile.TileEntityXPSolidifier; +import de.ellpeck.actuallyadditions.mod.tile.*; import de.ellpeck.actuallyadditions.registration.AABlockReg; import net.minecraft.core.registries.BuiltInRegistries; import net.minecraft.world.item.Item; -import net.minecraft.world.level.block.Blocks; -import net.minecraft.world.level.block.SlabBlock; -import net.minecraft.world.level.block.SoundType; -import net.minecraft.world.level.block.StairBlock; -import net.minecraft.world.level.block.WallBlock; +import net.minecraft.world.level.block.*; import net.minecraft.world.level.block.entity.BlockEntityType; import net.minecraft.world.level.block.state.BlockBehaviour; import net.minecraft.world.level.material.MapColor; @@ -161,8 +110,10 @@ public final class ActuallyBlocks { public static final AABlockReg POWERED_FURNACE = new AABlockReg<>("powered_furnace", BlockPoweredFurnace::new, (b) -> new AABlockItem.BlockEntityEnergyItem(b, defaultBlockItemProperties), TileEntityPoweredFurnace::new); +/* public static final AABlockReg CRATE_SMALL = new AABlockReg<>("crate_small", () -> new Crate(Crate.Size.SMALL), (b) -> new AABlockItem(b, defaultBlockItemProperties), (pos, state) -> new CrateBE(pos, state, Crate.Size.SMALL)); //TODO +*/ // Crystal Blocks diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/Crate.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/Crate.java index 6e3813775..c19ffc06d 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/Crate.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/Crate.java @@ -1,3 +1,4 @@ +/* package de.ellpeck.actuallyadditions.mod.blocks; import de.ellpeck.actuallyadditions.mod.blocks.base.BlockContainerBase; @@ -46,3 +47,4 @@ public class Crate extends BlockContainerBase { return new CrateBE(pPos, pState, this.size); } } +*/ diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/CrateBE.java b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/CrateBE.java index 1e12ac6b6..1c4a583b5 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/CrateBE.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/CrateBE.java @@ -1,3 +1,4 @@ +/* package de.ellpeck.actuallyadditions.mod.tile; import de.ellpeck.actuallyadditions.mod.blocks.ActuallyBlocks; @@ -16,3 +17,4 @@ public class CrateBE extends TileEntityBase{ return size; } } +*/ diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/util/CrateItemHandler.java b/src/main/java/de/ellpeck/actuallyadditions/mod/util/CrateItemHandler.java index 73043b23a..190ffd0bd 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/util/CrateItemHandler.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/util/CrateItemHandler.java @@ -1,3 +1,4 @@ +/* package de.ellpeck.actuallyadditions.mod.util; import de.ellpeck.actuallyadditions.mod.blocks.Crate; @@ -21,3 +22,4 @@ public class CrateItemHandler extends ItemStackHandlerAA { return 64 * this.size.getStackBoost(); } } +*/