More Yeeting

port.MD

@@ -5,9 +5,9 @@
 - [x] Occasional solidified XP drop from mobs
 - [ ] Treasure chests
 - [ ] Composter and bio-mash, biomass, bio coal and fertilizer
-- [ ] Charcoal blocks
+- [x] Charcoal blocks
 - [ ] Ender pearl blocks
-- [ ] ESDs
+- [x] ESDs
 - [ ] Fishing nets
 - [ ] Solar panels
 - [ ] Item repairers

src/generated/resources/.cache/cache

@@ -16,7 +16,6 @@ ac5d75bda4dc24894fb380d5e3ec751a0aa5c498 assets/actuallyadditions/blockstates/bl
 5dea2f0e554a5ecb9b7f547526d745ff85353a40 assets/actuallyadditions/blockstates/breaker.json
 e3b6949dc703f984bc10cb5794171ab1623f7bad assets/actuallyadditions/blockstates/canola.json
 5101139337dd4e5a057333e9e424df47f7138c93 assets/actuallyadditions/blockstates/canola_press.json
-c8d5786cd66f324b82d201e6e4eb0ae0a5978d13 assets/actuallyadditions/blockstates/charcoal_block.json
 998b11d1f63e153ab2f8bd11830405611c8886a2 assets/actuallyadditions/blockstates/chiseled_black_quartz_block.json
 84525ecc49bdb7285b34ff5028fc25c198f03ccd assets/actuallyadditions/blockstates/chiseled_black_quartz_slab.json
 c2fe87cf0b2fea00b52ab59cd6a90d3d876b1218 assets/actuallyadditions/blockstates/chiseled_black_quartz_stair.json
@@ -150,7 +149,6 @@ ee7cee63dc7889fac05160a97ab0664920269ed7 assets/actuallyadditions/models/block/c
 981ceb96a82d90cdf636fd5c763c39dae7c923b5 assets/actuallyadditions/models/block/canola_2.json
 ca75d2ce24c66949daf7cd966a89a3a6e19d6ac5 assets/actuallyadditions/models/block/canola_3.json
 ead34cc4f003d8b748dc723f2bbff74e03f90270 assets/actuallyadditions/models/block/canola_4.json
-49e551c7f9943bd24b1fa09fb65836bae48096df assets/actuallyadditions/models/block/charcoal_block.json
 48a6232ced27b9a35fc236705adb2ea817a03b3f assets/actuallyadditions/models/block/chiseled_black_quartz_slab.json
 85a969896c0aad4f70878d4c075c6c0885a5ade4 assets/actuallyadditions/models/block/chiseled_black_quartz_slab_top.json
 f0ee4cd74049c6a00f62166335348602f7b8972d assets/actuallyadditions/models/block/chiseled_black_quartz_stair.json
@@ -232,16 +230,6 @@ ec9fa5a527a295dff5372ebd0df98372874c77fe assets/actuallyadditions/models/block/s
 83da16f21abc2ec8361ecc3b1bda2852d48dbd97 assets/actuallyadditions/models/block/wood_casing.json
 0753c814deb4cc275d0fce0b87ec12ba1b12c0eb assets/actuallyadditions/models/item/advanced_coil.json
 637043b066b31f811a9ed94de66d965333f35dd3 assets/actuallyadditions/models/item/advanced_leaf_blower.json
-545e115b1a4e92b2dae062e350e9ebf0897f0a6d assets/actuallyadditions/models/item/advanced_ring_of_fire_resistance.json
-d9f71f81d10a51b3a8084ee4a631052d688b098f assets/actuallyadditions/models/item/advanced_ring_of_haste.json
-080c9e9f8b7bd9306c5f338c570628c4e21d8fa1 assets/actuallyadditions/models/item/advanced_ring_of_invisibility.json
-97ffe564dc19a9e0bb87372365a27333f34ca3b2 assets/actuallyadditions/models/item/advanced_ring_of_jump_boost.json
-a5f120637438fce6d7e5086b2ff7e20af4d1fc08 assets/actuallyadditions/models/item/advanced_ring_of_night_vision.json
-66b7d196d0929c1935bd90f83f47ab408e3c4ae0 assets/actuallyadditions/models/item/advanced_ring_of_regeneration.json
-b44b89c4bdeba59dabbd1866ba2aa51bf362dfe2 assets/actuallyadditions/models/item/advanced_ring_of_resistance.json
-06019b99bfb91567fa3ecfe9477445961be6ee3f assets/actuallyadditions/models/item/advanced_ring_of_speed.json
-8d0f5847089b6026a6f6e6733e9b5a04195b5560 assets/actuallyadditions/models/item/advanced_ring_of_strength.json
-17dc79ab2bb098c6b99a924b226edf8a17d75ef1 assets/actuallyadditions/models/item/advanced_ring_of_water_breathing.json
 c2e3b2291b34f85eab9907c9266c6198d8478001 assets/actuallyadditions/models/item/atomic_reconstructor.json
 8c837329c79dd9f611a860f32b0184674ad8fb3c assets/actuallyadditions/models/item/basic_coil.json
 bbd32f2ac5a2a55332aa9b73fd06aa1462fdd29a assets/actuallyadditions/models/item/bats_wing.json
@@ -266,7 +254,6 @@ e1b2c741f6da5cfb51392b1a722c4d664ae2400e assets/actuallyadditions/models/item/ca
 e4b8fbed9602c0cf96eff84111586799412982fc assets/actuallyadditions/models/item/canola_oil_bucket.json
 08c70d561c219bb4c6d21b5f56192df81f054e0a assets/actuallyadditions/models/item/canola_press.json
 0507025fadef30e363cbc825265576c782880f7b assets/actuallyadditions/models/item/canola_seeds.json
-83b47876ba2c85d3ba83e36ee9b02a8d458f7230 assets/actuallyadditions/models/item/charcoal_block.json
 36179c5cc77dc38364a1931f2fabbf846ef9c39d assets/actuallyadditions/models/item/chiseled_black_quartz_block.json
 27c8ed9e39b600161a6a327db0ac53e10acc13bb assets/actuallyadditions/models/item/chiseled_black_quartz_slab.json
 0b574626d1648584c3afa6ee0ccc974fb68bb425 assets/actuallyadditions/models/item/chiseled_black_quartz_stair.json
@@ -443,18 +430,8 @@ abb3269b59d79295ac25bc1d89eb223ea0ee454a assets/actuallyadditions/models/item/re
 dcfcded1a57642706d6fc9bc7bdcf5338b18d183 assets/actuallyadditions/models/item/rice_seeds.json
 18087d4ee31e7ced9db334fe0036acd890f2f974 assets/actuallyadditions/models/item/rice_slimeball.json
 f8563b3660b69decda6e510e589c55ae568e941e assets/actuallyadditions/models/item/ring.json
-9fe5cd51e6bce1a40c4e9513629e3ff33ca1e8f5 assets/actuallyadditions/models/item/ring_of_fire_resistance.json
 c48d9fe3a0051a30496348f7dc22dc142be3a063 assets/actuallyadditions/models/item/ring_of_growth.json
-aa25eac98808f348703e47eb72e72d8922f91a0f assets/actuallyadditions/models/item/ring_of_haste.json
-5f44652db6124a9045449ba41f7d5e3368d574e0 assets/actuallyadditions/models/item/ring_of_invisibility.json
-4d1717c4a8ce82e8fcc37b81a80b6812407843a4 assets/actuallyadditions/models/item/ring_of_jump_boost.json
 6d2c70e9d473147c72b70fbea292f90dd50ab5c2 assets/actuallyadditions/models/item/ring_of_magnetizing.json
-9fd0c798d9fc66f7f0c7bef6540ad5b044041fb9 assets/actuallyadditions/models/item/ring_of_night_vision.json
-785231b5532e03c7798b47e20587e9b3afe1ac83 assets/actuallyadditions/models/item/ring_of_regeneration.json
-44ca21d87e5a88b1ef023eaeac6b49916f8239c2 assets/actuallyadditions/models/item/ring_of_resistance.json
-effc6399e0ff29ede6bc0c506ff3d4220b934b90 assets/actuallyadditions/models/item/ring_of_speed.json
-ab0b21a1a76f80574d19a31ef7be2f9bf332b247 assets/actuallyadditions/models/item/ring_of_strength.json
-5b216a312b45879855124a48b35a15e6ec3c2207 assets/actuallyadditions/models/item/ring_of_water_breathing.json
 8334f0d8c5364b930a8d674cfe86f8b4461b03f3 assets/actuallyadditions/models/item/shock_suppressor.json
 ef7f9a92f8b47c3de7f732172f7bb0d996b38718 assets/actuallyadditions/models/item/single_battery.json
 9f4437d75b9112335d96ca928da9d4e73a573f50 assets/actuallyadditions/models/item/smooth_black_quartz_block.json
@@ -500,7 +477,6 @@ b12f24fa635a72ea41c5cab68015b47b01e85846 data/actuallyadditions/loot_tables/bloc
 8cd0a700e62111e5a4351788072bf816731ab493 data/actuallyadditions/loot_tables/blocks/breaker.json
 91fae25a55c4f58e5871c6008c5c13f89cb62198 data/actuallyadditions/loot_tables/blocks/canola.json
 f3df22f203e8c00ee7ee004bb9b4edfd522f069a data/actuallyadditions/loot_tables/blocks/canola_press.json
-e0629b02f20d4767a3e97f189e8b7631a0d008cb data/actuallyadditions/loot_tables/blocks/charcoal_block.json
 55e8641b836aab36848edf7d0eab33e647571fc8 data/actuallyadditions/loot_tables/blocks/chiseled_black_quartz_block.json
 7b10afffb30390977f1729356e0b4959ccb4cf1c data/actuallyadditions/loot_tables/blocks/chiseled_black_quartz_slab.json
 6df5538ba7cf057d19728f8e615862a84b9d4bb1 data/actuallyadditions/loot_tables/blocks/chiseled_black_quartz_stair.json
@@ -717,7 +693,6 @@ cce14618f9e39666e2858bf09c3cc7197e758b1c data/actuallyadditions/recipes/liquid_f
 85d2537a973d520c9eaaf2f15109c265faa2df3a data/actuallyadditions/recipes/rice_slime_potion.json
 d4ca5d77d16ff6fdfc60e665694fdd97bce25463 data/actuallyadditions/recipes/shock_suppressor.json
 655fab699bb97ec252deb61d91fbef6f4738fe1c data/actuallyadditions/recipes/single_battery.json
-dcf0bf28f7be72a9d65b7d34626d1a211c97365a data/actuallyadditions/recipes/solid_fuel/charcoal-block.json
 000ef9362f2202191f74132c3079ec4c1e2bfec8 data/actuallyadditions/recipes/solid_fuel/charcoal.json
 64211ff8cd4ae617f3be4bc6d7e9ff1f73c46e7d data/actuallyadditions/recipes/solid_fuel/coal-block.json
 340732fadc7be543ba9ae17f6f1c974022d31de3 data/actuallyadditions/recipes/solid_fuel/coal.json

src/generated/resources/assets/actuallyadditions/blockstates/charcoal_block.json

@@ -1,7 +0,0 @@
-{
-  "variants": {
-    "": {
-      "model": "actuallyadditions:block/charcoal_block"
-    }
-  }
-}

src/generated/resources/assets/actuallyadditions/models/block/charcoal_block.json

@@ -1,6 +0,0 @@
-{
-  "parent": "minecraft:block/cube_all",
-  "textures": {
-    "all": "actuallyadditions:block/charcoal_block"
-  }
-}

src/generated/resources/assets/actuallyadditions/models/item/advanced_ring_of_fire_resistance.json

@@ -1,6 +0,0 @@
-{
-  "parent": "minecraft:item/handheld",
-  "textures": {
-    "layer0": "actuallyadditions:item/advanced_ring_of_fire_resistance"
-  }
-}

src/generated/resources/assets/actuallyadditions/models/item/advanced_ring_of_haste.json

@@ -1,6 +0,0 @@
-{
-  "parent": "minecraft:item/handheld",
-  "textures": {
-    "layer0": "actuallyadditions:item/advanced_ring_of_haste"
-  }
-}

src/generated/resources/assets/actuallyadditions/models/item/advanced_ring_of_invisibility.json

@@ -1,6 +0,0 @@
-{
-  "parent": "minecraft:item/handheld",
-  "textures": {
-    "layer0": "actuallyadditions:item/advanced_ring_of_invisibility"
-  }
-}

src/generated/resources/assets/actuallyadditions/models/item/advanced_ring_of_jump_boost.json

@@ -1,6 +0,0 @@
-{
-  "parent": "minecraft:item/handheld",
-  "textures": {
-    "layer0": "actuallyadditions:item/advanced_ring_of_jump_boost"
-  }
-}

src/generated/resources/assets/actuallyadditions/models/item/advanced_ring_of_night_vision.json

@@ -1,6 +0,0 @@
-{
-  "parent": "minecraft:item/handheld",
-  "textures": {
-    "layer0": "actuallyadditions:item/advanced_ring_of_night_vision"
-  }
-}

src/generated/resources/assets/actuallyadditions/models/item/advanced_ring_of_regeneration.json

@@ -1,6 +0,0 @@
-{
-  "parent": "minecraft:item/handheld",
-  "textures": {
-    "layer0": "actuallyadditions:item/advanced_ring_of_regeneration"
-  }
-}

src/generated/resources/assets/actuallyadditions/models/item/advanced_ring_of_resistance.json

@@ -1,6 +0,0 @@
-{
-  "parent": "minecraft:item/handheld",
-  "textures": {
-    "layer0": "actuallyadditions:item/advanced_ring_of_resistance"
-  }
-}

src/generated/resources/assets/actuallyadditions/models/item/advanced_ring_of_speed.json

@@ -1,6 +0,0 @@
-{
-  "parent": "minecraft:item/handheld",
-  "textures": {
-    "layer0": "actuallyadditions:item/advanced_ring_of_speed"
-  }
-}

src/generated/resources/assets/actuallyadditions/models/item/advanced_ring_of_strength.json

@@ -1,6 +0,0 @@
-{
-  "parent": "minecraft:item/handheld",
-  "textures": {
-    "layer0": "actuallyadditions:item/advanced_ring_of_strength"
-  }
-}

src/generated/resources/assets/actuallyadditions/models/item/advanced_ring_of_water_breathing.json

@@ -1,6 +0,0 @@
-{
-  "parent": "minecraft:item/handheld",
-  "textures": {
-    "layer0": "actuallyadditions:item/advanced_ring_of_water_breathing"
-  }
-}

src/generated/resources/assets/actuallyadditions/models/item/charcoal_block.json

@@ -1,3 +0,0 @@
-{
-  "parent": "actuallyadditions:block/charcoal_block"
-}

src/generated/resources/assets/actuallyadditions/models/item/ring_of_fire_resistance.json

@@ -1,6 +0,0 @@
-{
-  "parent": "minecraft:item/handheld",
-  "textures": {
-    "layer0": "actuallyadditions:item/ring_of_fire_resistance"
-  }
-}

src/generated/resources/assets/actuallyadditions/models/item/ring_of_haste.json

@@ -1,6 +0,0 @@
-{
-  "parent": "minecraft:item/handheld",
-  "textures": {
-    "layer0": "actuallyadditions:item/ring_of_haste"
-  }
-}

src/generated/resources/assets/actuallyadditions/models/item/ring_of_invisibility.json

@@ -1,6 +0,0 @@
-{
-  "parent": "minecraft:item/handheld",
-  "textures": {
-    "layer0": "actuallyadditions:item/ring_of_invisibility"
-  }
-}

src/generated/resources/assets/actuallyadditions/models/item/ring_of_jump_boost.json

@@ -1,6 +0,0 @@
-{
-  "parent": "minecraft:item/handheld",
-  "textures": {
-    "layer0": "actuallyadditions:item/ring_of_jump_boost"
-  }
-}

src/generated/resources/assets/actuallyadditions/models/item/ring_of_night_vision.json

@@ -1,6 +0,0 @@
-{
-  "parent": "minecraft:item/handheld",
-  "textures": {
-    "layer0": "actuallyadditions:item/ring_of_night_vision"
-  }
-}

src/generated/resources/assets/actuallyadditions/models/item/ring_of_regeneration.json

@@ -1,6 +0,0 @@
-{
-  "parent": "minecraft:item/handheld",
-  "textures": {
-    "layer0": "actuallyadditions:item/ring_of_regeneration"
-  }
-}

src/generated/resources/assets/actuallyadditions/models/item/ring_of_resistance.json

@@ -1,6 +0,0 @@
-{
-  "parent": "minecraft:item/handheld",
-  "textures": {
-    "layer0": "actuallyadditions:item/ring_of_resistance"
-  }
-}

src/generated/resources/assets/actuallyadditions/models/item/ring_of_speed.json

@@ -1,6 +0,0 @@
-{
-  "parent": "minecraft:item/handheld",
-  "textures": {
-    "layer0": "actuallyadditions:item/ring_of_speed"
-  }
-}

src/generated/resources/assets/actuallyadditions/models/item/ring_of_strength.json

@@ -1,6 +0,0 @@
-{
-  "parent": "minecraft:item/handheld",
-  "textures": {
-    "layer0": "actuallyadditions:item/ring_of_strength"
-  }
-}

src/generated/resources/assets/actuallyadditions/models/item/ring_of_water_breathing.json

@@ -1,6 +0,0 @@
-{
-  "parent": "minecraft:item/handheld",
-  "textures": {
-    "layer0": "actuallyadditions:item/ring_of_water_breathing"
-  }
-}

src/generated/resources/data/actuallyadditions/loot_tables/blocks/charcoal_block.json

@@ -1,19 +0,0 @@
-{
-  "type": "minecraft:block",
-  "pools": [
-    {
-      "rolls": 1,
-      "entries": [
-        {
-          "type": "minecraft:item",
-          "name": "actuallyadditions:charcoal_block"
-        }
-      ],
-      "conditions": [
-        {
-          "condition": "minecraft:survives_explosion"
-        }
-      ]
-    }
-  ]
-}

src/generated/resources/data/actuallyadditions/recipes/solid_fuel/charcoal-block.json

@@ -1,8 +0,0 @@
-{
-  "type": "actuallyadditions:solid_fuel",
-  "item": {
-    "item": "actuallyadditions:charcoal_block"
-  },
-  "total_energy": 320000,
-  "burn_time": 16000
-}

src/main/java/de/ellpeck/actuallyadditions/data/BlockStateGenerator.java

@@ -155,7 +155,6 @@ public class BlockStateGenerator extends BlockStateProvider {
             .partialState().with(CropsBlock.AGE, 7).modelForState().modelFile(models().crop("coffee_4", modLoc("block/coffee_stage_6"))).addModel();
 
 
-        buildCubeAll(ActuallyBlocks.CHARCOAL_BLOCK);
         buildCubeAll(ActuallyBlocks.ENDER_CASING);
         buildCubeAll(ActuallyBlocks.ENDER_PEARL_BLOCK);
         buildCubeAll(ActuallyBlocks.IRON_CASING);

src/main/java/de/ellpeck/actuallyadditions/data/FuelRecipeGenerator.java

@@ -39,7 +39,6 @@ public class FuelRecipeGenerator extends RecipeProvider {
         addSolid(consumer, "tiny-coal", ActuallyTags.Items.TINY_COALS, 4000, 200);
         addSolid(consumer, "charcoal", Items.CHARCOAL, 32000, 1600);
         addSolid(consumer, "coal-block", Items.COAL_BLOCK, 320000, 16000);
-        addSolid(consumer, "charcoal-block", ActuallyBlocks.CHARCOAL_BLOCK.getItem(), 320000, 16000);
         addSolid(consumer, "lava", Items.LAVA_BUCKET, 400000, 20000);
 
         consumer.accept(new LiquidFuelRecipe.FinishedRecipe(new ResourceLocation(ActuallyAdditions.MODID, "liquid_fuel/canola_oil"),

src/main/java/de/ellpeck/actuallyadditions/data/LootTableGenerator.java

@@ -142,7 +142,6 @@ public class LootTableGenerator extends LootTableProvider {
             this.dropSelf(ActuallyBlocks.LAMP_BLACK.get());
             this.dropSelf(ActuallyBlocks.LAMP_CONTROLLER.get());
             this.dropSelf(ActuallyBlocks.ENDER_PEARL_BLOCK.get());
-            this.dropSelf(ActuallyBlocks.CHARCOAL_BLOCK.get());
             this.dropSelf(ActuallyBlocks.ENDER_CASING.get());
             this.dropSelf(ActuallyBlocks.IRON_CASING.get());
             //this.dropSelf(ActuallyBlocks.IRON_CASING_SNOW.get());

src/main/java/de/ellpeck/actuallyadditions/mod/blocks/ActuallyBlocks.java

@@ -212,8 +212,6 @@ public final class ActuallyBlocks {
     // Misc building blocks
     public static final AABlockReg<ActuallyBlock, AABlockItem, ?> ENDER_PEARL_BLOCK = new AABlockReg<>("ender_pearl_block", () -> new ActuallyBlock(miscBlockProperties),
         (b) -> new AABlockItem(b, defaultBlockItemProperties));
-    public static final AABlockReg<ActuallyBlock, AABlockItem, ?> CHARCOAL_BLOCK = new AABlockReg<>("charcoal_block", () -> new ActuallyBlock(miscBlockProperties),
-        (b) -> new AABlockItem(b, defaultBlockItemProperties));
     public static final AABlockReg<ActuallyBlock, AABlockItem, ?> BLACK_QUARTZ_ORE = new AABlockReg<>("black_quartz_ore", () -> new ActuallyBlock(miscBlockProperties),
         (b) -> new AABlockItem(b, defaultBlockItemProperties));
 

src/main/java/de/ellpeck/actuallyadditions/mod/blocks/base/BlockContainerBase.java

@@ -41,6 +41,7 @@ import net.minecraftforge.fluids.FluidUtil;
 import net.minecraftforge.fluids.capability.templates.FluidTank;
 import net.minecraftforge.fml.network.NetworkHooks;
 
+import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 import java.util.Random;
 
@@ -108,7 +109,7 @@ public abstract class BlockContainerBase extends Block {
     }
 
     @Override
-    public void tick(BlockState state, ServerWorld world, BlockPos pos, Random rand) {
+    public void tick(@Nonnull BlockState state, ServerWorld world, @Nonnull BlockPos pos, @Nonnull Random rand) {
         if (!world.isClientSide) {
             TileEntity tile = world.getBlockEntity(pos);
             if (tile instanceof TileEntityBase) {
@@ -133,7 +134,7 @@ public abstract class BlockContainerBase extends Block {
     }
 
     @Override //TODO do we need this?
-    public void neighborChanged(BlockState state, World worldIn, BlockPos pos, Block blockIn, BlockPos fromPos, boolean isMoving) {
+    public void neighborChanged(@Nonnull BlockState state, @Nonnull World worldIn, @Nonnull BlockPos pos, @Nonnull Block blockIn, @Nonnull BlockPos fromPos, boolean isMoving) {
         this.neighborsChangedCustom(worldIn, pos);
     }
 
@@ -174,7 +175,7 @@ public abstract class BlockContainerBase extends Block {
     }
 
     @Override
-    public void onPlace(BlockState state, World worldIn, BlockPos pos, BlockState oldState, boolean isMoving) {
+    public void onPlace(@Nonnull BlockState state, @Nonnull World worldIn, @Nonnull BlockPos pos, @Nonnull BlockState oldState, boolean isMoving) {
         this.updateRedstoneState(worldIn, pos);
     }
 
@@ -191,7 +192,7 @@ public abstract class BlockContainerBase extends Block {
     }
 
     @Override
-    public void playerWillDestroy(World world, BlockPos pos, BlockState state, PlayerEntity player) {
+    public void playerWillDestroy(@Nonnull World world, @Nonnull BlockPos pos, @Nonnull BlockState state, PlayerEntity player) {
         if (!player.isCreative()) {
             TileEntity tile = world.getBlockEntity(pos);
             if (tile instanceof TileEntityBase && ((TileEntityBase) tile).stopFromDropping) {

src/main/java/de/ellpeck/actuallyadditions/mod/data/WorldData.java

@@ -49,6 +49,7 @@ public class WorldData extends WorldSavedData {
         return storage;
     }
 
+    //TODO what in the world is this?
     public static void clear() {
         if (data != null) {
             data = null;