diff --git a/src/generated/resources/assets/create/models/item/limesand.json b/src/generated/resources/assets/create/models/item/limesand.json new file mode 100644 index 000000000..120a20239 --- /dev/null +++ b/src/generated/resources/assets/create/models/item/limesand.json @@ -0,0 +1,3 @@ +{ + "parent": "create:block/limesand" +} \ No newline at end of file diff --git a/src/generated/resources/data/create/loot_tables/blocks/belt_funnel.json b/src/generated/resources/data/create/loot_tables/blocks/belt_funnel.json index 2015decf2..78793172c 100644 --- a/src/generated/resources/data/create/loot_tables/blocks/belt_funnel.json +++ b/src/generated/resources/data/create/loot_tables/blocks/belt_funnel.json @@ -6,7 +6,7 @@ "entries": [ { "type": "minecraft:item", - "name": "create:belt_funnel" + "name": "minecraft:air" } ], "conditions": [ diff --git a/src/generated/resources/data/create/loot_tables/blocks/limesand.json b/src/generated/resources/data/create/loot_tables/blocks/limesand.json index 78793172c..c0fcc6d79 100644 --- a/src/generated/resources/data/create/loot_tables/blocks/limesand.json +++ b/src/generated/resources/data/create/loot_tables/blocks/limesand.json @@ -6,7 +6,7 @@ "entries": [ { "type": "minecraft:item", - "name": "minecraft:air" + "name": "create:limesand" } ], "conditions": [ diff --git a/src/generated/resources/data/create/loot_tables/blocks/linked_extractor.json b/src/generated/resources/data/create/loot_tables/blocks/linked_extractor.json index 78793172c..3faa7e519 100644 --- a/src/generated/resources/data/create/loot_tables/blocks/linked_extractor.json +++ b/src/generated/resources/data/create/loot_tables/blocks/linked_extractor.json @@ -6,7 +6,7 @@ "entries": [ { "type": "minecraft:item", - "name": "minecraft:air" + "name": "create:linked_extractor" } ], "conditions": [ diff --git a/src/generated/resources/data/create/loot_tables/blocks/linked_transposer.json b/src/generated/resources/data/create/loot_tables/blocks/linked_transposer.json index 78793172c..31ecac893 100644 --- a/src/generated/resources/data/create/loot_tables/blocks/linked_transposer.json +++ b/src/generated/resources/data/create/loot_tables/blocks/linked_transposer.json @@ -6,7 +6,7 @@ "entries": [ { "type": "minecraft:item", - "name": "minecraft:air" + "name": "create:linked_transposer" } ], "conditions": [ diff --git a/src/main/java/com/simibubi/create/AllItems.java b/src/main/java/com/simibubi/create/AllItems.java index 65c86ab11..b6f41553a 100644 --- a/src/main/java/com/simibubi/create/AllItems.java +++ b/src/main/java/com/simibubi/create/AllItems.java @@ -1,10 +1,5 @@ package com.simibubi.create; -import static com.simibubi.create.foundation.item.AllToolTypes.AXE; -import static com.simibubi.create.foundation.item.AllToolTypes.HOE; -import static com.simibubi.create.foundation.item.AllToolTypes.PICKAXE; -import static com.simibubi.create.foundation.item.AllToolTypes.SHOVEL; - import java.util.HashSet; import java.util.Set; import java.util.function.Function; @@ -24,14 +19,9 @@ import com.simibubi.create.modules.curiosities.ChromaticCompoundCubeItem; import com.simibubi.create.modules.curiosities.RefinedRadianceItem; import com.simibubi.create.modules.curiosities.ShadowSteelItem; import com.simibubi.create.modules.curiosities.TreeFertilizerItem; -import com.simibubi.create.modules.curiosities.deforester.DeforesterItem; import com.simibubi.create.modules.curiosities.symmetry.SymmetryWandItem; -import com.simibubi.create.modules.curiosities.tools.AllToolTiers; -import com.simibubi.create.modules.curiosities.tools.BlazingSwordItem; -import com.simibubi.create.modules.curiosities.tools.BlazingToolItem; -import com.simibubi.create.modules.curiosities.tools.RoseQuartzToolItem; +import com.simibubi.create.modules.curiosities.tools.DeforesterItem; import com.simibubi.create.modules.curiosities.tools.SandPaperItem; -import com.simibubi.create.modules.curiosities.tools.ShadowSteelToolItem; import com.simibubi.create.modules.curiosities.zapper.blockzapper.BlockzapperItem; import com.simibubi.create.modules.curiosities.zapper.terrainzapper.TerrainzapperItem; import com.simibubi.create.modules.logistics.item.filter.FilterItem; @@ -46,7 +36,6 @@ import net.minecraft.item.Item; import net.minecraft.item.Item.Properties; import net.minecraft.item.ItemStack; import net.minecraft.item.Rarity; -import net.minecraft.item.SwordItem; import net.minecraft.util.ResourceLocation; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; @@ -119,21 +108,6 @@ public enum AllItems { TERRAIN_ZAPPER(TerrainzapperItem::new), DEFORESTER(DeforesterItem::new), SYMMETRY_WAND(SymmetryWandItem::new), - ZINC_HANDLE, - - BLAZING_PICKAXE(p -> new BlazingToolItem(1, -2.8F, p, PICKAXE)), - BLAZING_SHOVEL(p -> new BlazingToolItem(1.5F, -3.0F, p, SHOVEL)), - BLAZING_AXE(p -> new BlazingToolItem(5.0F, -3.0F, p, AXE)), - BLAZING_SWORD(p -> new BlazingSwordItem(AllToolTiers.BLAZING, 3, -2.4F, p)), - - ROSE_QUARTZ_PICKAXE(p -> new RoseQuartzToolItem(1, -2.8F, p, PICKAXE)), - ROSE_QUARTZ_SHOVEL(p -> new RoseQuartzToolItem(1.5F, -3.0F, p, SHOVEL)), - ROSE_QUARTZ_AXE(p -> new RoseQuartzToolItem(5.0F, -3.0F, p, AXE)), - ROSE_QUARTZ_SWORD(p -> new SwordItem(AllToolTiers.ROSE_QUARTZ, 3, -2.4F, p)), - - SHADOW_STEEL_PICKAXE(p -> new ShadowSteelToolItem(2.5F, -2.0F, p, PICKAXE)), - SHADOW_STEEL_MATTOCK(p -> new ShadowSteelToolItem(2.5F, -1.5F, p, SHOVEL, AXE, HOE)), - SHADOW_STEEL_SWORD(p -> new SwordItem(AllToolTiers.SHADOW_STEEL, 3, -2.0F, p)), _5_(Sections.SCHEMATICS), diff --git a/src/main/java/com/simibubi/create/ScreenResources.java b/src/main/java/com/simibubi/create/ScreenResources.java index 98a4e1a6f..49ec0f276 100644 --- a/src/main/java/com/simibubi/create/ScreenResources.java +++ b/src/main/java/com/simibubi/create/ScreenResources.java @@ -49,35 +49,6 @@ public enum ScreenResources { SEQUENCER_END("sequencer.png", 14, 83, 131, 18), SEQUENCER_EMPTY("sequencer.png", 14, 101, 131, 18), - // Logistical Index - INDEX_TOP("index.png", 41, 0, 174, 22), - INDEX_TOP_TRIM("index.png", 41, 22, 174, 6), - INDEX_MIDDLE("index.png", 41, 28, 183, 178), - INDEX_BOTTOM_TRIM("index.png", 41, 206, 174, 6), - INDEX_BOTTOM("index.png", 41, 212, 181, 44), - INDEX_SCROLLER_TOP("index.png", 224, 31, 10, 6), - INDEX_SCROLLER_MIDDLE("index.png", 224, 37, 10, 6), - INDEX_SCROLLER_BOTTOM("index.png", 224, 43, 10, 6), - INDEX_TAB("index.png", 0, 55, 22, 22), - INDEX_TAB_ACTIVE("index.png", 0, 77, 22, 22), - INDEX_SEARCH("index.png", 0, 99, 28, 19), - INDEX_SEARCH_OVERLAY("widgets.png", 0, 81, 176, 20), - - LOGISTICAL_CONTROLLER_TRIM("controller.png", 178, 6), - LOGISTICAL_CONTROLLER("controller.png", 0, 6, 185, 71), - - ITEM_COUNT_SCROLLAREA("controller.png", 62, 83, 22, 10), - BIG_SLOT("controller.png", 0, 83, 26, 26), - SHIPPING_SLOT("controller.png", 26, 83, 18, 21), - RECEIVING_SLOT("controller.png", 44, 83, 18, 21), - SLOT_FRAME("index.png", 0, 118, 18, 18), - SLOT_INNER("index.png", 18, 118, 18, 18), - DISABLED_SLOT_FRAME("index.png", 0, 136, 18, 18), - DISABLED_SLOT_INNER("index.png", 18, 136, 18, 18), - CRAFTY_SLOT_FRAME("index.png", 0, 154, 18, 18), - CRAFTY_SLOT_INNER("index.png", 18, 154, 18, 18), - SELECTED_SLOT_INNER("index.png", 18, 172, 18, 18), - // JEI JEI_SLOT("jei/widgets.png", 18, 18), JEI_CHANCE_SLOT("jei/widgets.png", 20, 156, 18, 18), diff --git a/src/main/java/com/simibubi/create/modules/curiosities/tools/AllToolTiers.java b/src/main/java/com/simibubi/create/modules/curiosities/tools/AllToolTiers.java index ded204697..7b86104f9 100644 --- a/src/main/java/com/simibubi/create/modules/curiosities/tools/AllToolTiers.java +++ b/src/main/java/com/simibubi/create/modules/curiosities/tools/AllToolTiers.java @@ -5,24 +5,11 @@ import java.util.function.Supplier; import com.simibubi.create.AllItems; import net.minecraft.item.IItemTier; -import net.minecraft.item.Items; import net.minecraft.item.crafting.Ingredient; import net.minecraft.util.LazyValue; public enum AllToolTiers implements IItemTier { - BLAZING(3, 450, 10.0F, 2.5F, 16, () -> { - return Ingredient.fromItems(Items.BLAZE_ROD); - }), - - ROSE_QUARTZ(3, 1644, 7.0F, 2.0F, 24, () -> { - return Ingredient.fromItems(AllItems.POLISHED_ROSE_QUARTZ.get()); - }), - - SHADOW_STEEL(4, 2303, 28.0F, 3.5F, 10, () -> { - return Ingredient.fromItems(AllItems.SHADOW_STEEL.get()); - }), - RADIANT(4, 1024, 16.0F, 3.5F, 10, () -> { return Ingredient.fromItems(AllItems.REFINED_RADIANCE.get()); }), diff --git a/src/main/java/com/simibubi/create/modules/curiosities/tools/BlazingSwordItem.java b/src/main/java/com/simibubi/create/modules/curiosities/tools/BlazingSwordItem.java deleted file mode 100644 index 36ec39727..000000000 --- a/src/main/java/com/simibubi/create/modules/curiosities/tools/BlazingSwordItem.java +++ /dev/null @@ -1,26 +0,0 @@ -package com.simibubi.create.modules.curiosities.tools; - -import net.minecraft.entity.LivingEntity; -import net.minecraft.item.IItemTier; -import net.minecraft.item.ItemStack; -import net.minecraft.item.SwordItem; - -public class BlazingSwordItem extends SwordItem { - - public BlazingSwordItem(IItemTier tier, int attackDamageIn, float attackSpeedIn, Properties builder) { - super(tier, attackDamageIn, attackSpeedIn, builder); - } - - @Override - public boolean hitEntity(ItemStack stack, LivingEntity target, LivingEntity attacker) { - target.setFire(2); - return BlazingToolItem.shouldTakeDamage(attacker.world, stack) ? super.hitEntity(stack, target, attacker) - : true; - } - - @Override - public int getBurnTime(ItemStack itemStack) { - return itemStack.getMaxDamage() - itemStack.getDamage() + 1; - } - -} diff --git a/src/main/java/com/simibubi/create/modules/curiosities/tools/BlazingToolItem.java b/src/main/java/com/simibubi/create/modules/curiosities/tools/BlazingToolItem.java deleted file mode 100644 index 082041198..000000000 --- a/src/main/java/com/simibubi/create/modules/curiosities/tools/BlazingToolItem.java +++ /dev/null @@ -1,115 +0,0 @@ -package com.simibubi.create.modules.curiosities.tools; - -import java.util.ArrayList; -import java.util.Collection; -import java.util.Iterator; -import java.util.List; -import java.util.Optional; - -import com.simibubi.create.foundation.item.AbstractToolItem; -import com.simibubi.create.foundation.item.AllToolTypes; -import com.simibubi.create.foundation.item.ItemHelper; -import com.simibubi.create.foundation.utility.VecHelper; - -import net.minecraft.block.BlockState; -import net.minecraft.enchantment.EnchantmentHelper; -import net.minecraft.enchantment.Enchantments; -import net.minecraft.entity.LivingEntity; -import net.minecraft.item.BlockItem; -import net.minecraft.item.ItemStack; -import net.minecraft.item.crafting.FurnaceRecipe; -import net.minecraft.item.crafting.IRecipeType; -import net.minecraft.item.crafting.RecipeManager; -import net.minecraft.particles.ParticleTypes; -import net.minecraft.tileentity.FurnaceTileEntity; -import net.minecraft.util.math.BlockPos; -import net.minecraft.util.math.Vec3d; -import net.minecraft.world.IWorld; -import net.minecraft.world.World; -import net.minecraft.world.dimension.DimensionType; - -public class BlazingToolItem extends AbstractToolItem { - - // FIXME this does not need to be a TE - static FurnaceTileEntity helperFurnace = new FurnaceTileEntity(); - - public BlazingToolItem(float attackDamageIn, float attackSpeedIn, Properties builder, AllToolTypes... types) { - super(attackDamageIn, attackSpeedIn, AllToolTiers.BLAZING, builder, types); - } - - @Override - public boolean onBlockDestroyed(ItemStack stack, World worldIn, BlockState state, BlockPos pos, - LivingEntity entityLiving) { - return shouldTakeDamage(worldIn, stack) ? super.onBlockDestroyed(stack, worldIn, state, pos, entityLiving) - : true; - } - - @Override - public int getBurnTime(ItemStack itemStack) { - return itemStack.getMaxDamage() - itemStack.getDamage() + 1; - } - - @Override - public boolean hitEntity(ItemStack stack, LivingEntity target, LivingEntity attacker) { - target.setFire(2); - return shouldTakeDamage(attacker.world, stack) ? super.hitEntity(stack, target, attacker) : true; - } - - static boolean shouldTakeDamage(World world, ItemStack stack) { - return world.getDimension().getType() != DimensionType.THE_NETHER; - } - - @Override - public boolean modifiesDrops() { - return true; - } - - @Override - public void modifyDrops(Collection drops, IWorld world, BlockPos pos, ItemStack tool, BlockState state) { - super.modifyDrops(drops, world, pos, tool, state); - World worldIn = world.getWorld(); - int enchantmentLevel = EnchantmentHelper.getEnchantmentLevel(Enchantments.FORTUNE, tool); - if (state == null) - enchantmentLevel = 0; - List smeltedStacks = smeltDrops(drops, worldIn, enchantmentLevel); - drops.addAll(smeltedStacks); - } - - public static List smeltDrops(Collection drops, World worldIn, int enchantmentLevel) { - helperFurnace.setLocation(worldIn, BlockPos.ZERO); - RecipeManager recipeManager = worldIn.getRecipeManager(); - List smeltedStacks = new ArrayList<>(); - Iterator dropper = drops.iterator(); - while (dropper.hasNext()) { - ItemStack stack = dropper.next(); - helperFurnace.setInventorySlotContents(0, stack); - Optional smeltingRecipe = - recipeManager.getRecipe(IRecipeType.SMELTING, helperFurnace, worldIn); - if (!smeltingRecipe.isPresent()) - continue; - dropper.remove(); - ItemStack out = smeltingRecipe.get().getRecipeOutput().copy(); - - float modifier = 1; - if (stack.getItem() instanceof BlockItem && !(out.getItem() instanceof BlockItem)) - modifier += worldIn.getRandom().nextFloat() * enchantmentLevel; - - out.setCount((int) (out.getCount() * modifier + .4f)); - smeltedStacks.addAll(ItemHelper.multipliedOutput(stack, out)); - } - return smeltedStacks; - } - - @Override - public void spawnParticles(IWorld world, BlockPos pos, ItemStack tool, BlockState state) { - if (!canHarvestBlock(tool, state)) - return; - for (int i = 0; i < 10; i++) { - Vec3d flamePos = VecHelper.offsetRandomly(VecHelper.getCenterOf(pos), world.getRandom(), .45f); - Vec3d smokePos = VecHelper.offsetRandomly(VecHelper.getCenterOf(pos), world.getRandom(), .45f); - world.addParticle(ParticleTypes.FLAME, flamePos.getX(), flamePos.getY(), flamePos.getZ(), 0, .01f, 0); - world.addParticle(ParticleTypes.SMOKE, smokePos.getX(), smokePos.getY(), smokePos.getZ(), 0, .1f, 0); - } - } - -} diff --git a/src/main/java/com/simibubi/create/modules/curiosities/deforester/DeforesterItem.java b/src/main/java/com/simibubi/create/modules/curiosities/tools/DeforesterItem.java similarity index 96% rename from src/main/java/com/simibubi/create/modules/curiosities/deforester/DeforesterItem.java rename to src/main/java/com/simibubi/create/modules/curiosities/tools/DeforesterItem.java index a265b31a2..31c0a829e 100644 --- a/src/main/java/com/simibubi/create/modules/curiosities/deforester/DeforesterItem.java +++ b/src/main/java/com/simibubi/create/modules/curiosities/tools/DeforesterItem.java @@ -1,4 +1,4 @@ -package com.simibubi.create.modules.curiosities.deforester; +package com.simibubi.create.modules.curiosities.tools; import com.simibubi.create.AllItems; import com.simibubi.create.foundation.block.render.CustomRenderedItemModel; @@ -7,7 +7,6 @@ import com.simibubi.create.foundation.utility.BlockHelper; import com.simibubi.create.foundation.utility.TreeCutter; import com.simibubi.create.foundation.utility.TreeCutter.Tree; import com.simibubi.create.foundation.utility.VecHelper; -import com.simibubi.create.modules.curiosities.tools.AllToolTiers; import net.minecraft.block.BlockState; import net.minecraft.client.renderer.model.IBakedModel; diff --git a/src/main/java/com/simibubi/create/modules/curiosities/deforester/DeforesterItemRenderer.java b/src/main/java/com/simibubi/create/modules/curiosities/tools/DeforesterItemRenderer.java similarity index 96% rename from src/main/java/com/simibubi/create/modules/curiosities/deforester/DeforesterItemRenderer.java rename to src/main/java/com/simibubi/create/modules/curiosities/tools/DeforesterItemRenderer.java index 36ce0e368..7032bdc43 100644 --- a/src/main/java/com/simibubi/create/modules/curiosities/deforester/DeforesterItemRenderer.java +++ b/src/main/java/com/simibubi/create/modules/curiosities/tools/DeforesterItemRenderer.java @@ -1,4 +1,4 @@ -package com.simibubi.create.modules.curiosities.deforester; +package com.simibubi.create.modules.curiosities.tools; import com.mojang.blaze3d.matrix.MatrixStack; import com.simibubi.create.foundation.utility.AnimationTickHolder; diff --git a/src/main/java/com/simibubi/create/modules/curiosities/deforester/DeforesterModel.java b/src/main/java/com/simibubi/create/modules/curiosities/tools/DeforesterModel.java similarity index 89% rename from src/main/java/com/simibubi/create/modules/curiosities/deforester/DeforesterModel.java rename to src/main/java/com/simibubi/create/modules/curiosities/tools/DeforesterModel.java index 57c6c2bc1..dd208f92c 100644 --- a/src/main/java/com/simibubi/create/modules/curiosities/deforester/DeforesterModel.java +++ b/src/main/java/com/simibubi/create/modules/curiosities/tools/DeforesterModel.java @@ -1,4 +1,4 @@ -package com.simibubi.create.modules.curiosities.deforester; +package com.simibubi.create.modules.curiosities.tools; import com.simibubi.create.foundation.block.render.CustomRenderedItemModel; diff --git a/src/main/java/com/simibubi/create/modules/curiosities/tools/RoseQuartzToolItem.java b/src/main/java/com/simibubi/create/modules/curiosities/tools/RoseQuartzToolItem.java deleted file mode 100644 index 6f88cef83..000000000 --- a/src/main/java/com/simibubi/create/modules/curiosities/tools/RoseQuartzToolItem.java +++ /dev/null @@ -1,27 +0,0 @@ -package com.simibubi.create.modules.curiosities.tools; - -import java.util.UUID; - -import com.google.common.collect.HashMultimap; -import com.google.common.collect.Multimap; -import com.simibubi.create.foundation.item.AbstractToolItem; -import com.simibubi.create.foundation.item.AllToolTypes; - -import net.minecraft.entity.ai.attributes.AttributeModifier; -import net.minecraft.entity.player.PlayerEntity; - -public class RoseQuartzToolItem extends AbstractToolItem { - - static Multimap rangeModifier; - static final UUID attributeId = UUID.fromString("7f7dbdb2-0d0d-458a-aa40-ac7633691f66"); - - public RoseQuartzToolItem(float attackDamageIn, float attackSpeedIn, Properties builder, AllToolTypes... types) { - super(attackDamageIn, attackSpeedIn, AllToolTiers.ROSE_QUARTZ, builder, types); - if (rangeModifier == null) { - rangeModifier = HashMultimap.create(); - rangeModifier.put(PlayerEntity.REACH_DISTANCE.getName(), - new AttributeModifier(attributeId, "Range modifier", 3, AttributeModifier.Operation.ADDITION)); - } - } - -} diff --git a/src/main/java/com/simibubi/create/modules/curiosities/tools/ShadowSteelToolItem.java b/src/main/java/com/simibubi/create/modules/curiosities/tools/ShadowSteelToolItem.java deleted file mode 100644 index 4ece6a42b..000000000 --- a/src/main/java/com/simibubi/create/modules/curiosities/tools/ShadowSteelToolItem.java +++ /dev/null @@ -1,40 +0,0 @@ -package com.simibubi.create.modules.curiosities.tools; - -import java.util.Collection; - -import com.simibubi.create.foundation.item.AbstractToolItem; -import com.simibubi.create.foundation.item.AllToolTypes; -import com.simibubi.create.foundation.utility.VecHelper; - -import net.minecraft.block.BlockState; -import net.minecraft.item.ItemStack; -import net.minecraft.particles.ParticleTypes; -import net.minecraft.util.math.BlockPos; -import net.minecraft.util.math.Vec3d; -import net.minecraft.world.IWorld; - -public class ShadowSteelToolItem extends AbstractToolItem { - - public ShadowSteelToolItem(float attackDamageIn, float attackSpeedIn, Properties builder, AllToolTypes... types) { - super(attackDamageIn, attackSpeedIn, AllToolTiers.SHADOW_STEEL, builder, types); - } - - @Override - public boolean modifiesDrops() { - return true; - } - - @Override - public void modifyDrops(Collection drops, IWorld world, BlockPos pos, ItemStack tool, BlockState state) { - drops.clear(); - } - - @Override - public void spawnParticles(IWorld world, BlockPos pos, ItemStack tool, BlockState state) { - if (!canHarvestBlock(tool, state)) - return; - Vec3d smokePos = VecHelper.offsetRandomly(VecHelper.getCenterOf(pos), world.getRandom(), .15f); - world.addParticle(ParticleTypes.SMOKE, smokePos.getX(), smokePos.getY(), smokePos.getZ(), 0, .01f, 0); - } - -} diff --git a/src/main/java/com/simibubi/create/modules/curiosities/tools/ToolEvents.java b/src/main/java/com/simibubi/create/modules/curiosities/tools/ToolEvents.java deleted file mode 100644 index 5660d3501..000000000 --- a/src/main/java/com/simibubi/create/modules/curiosities/tools/ToolEvents.java +++ /dev/null @@ -1,176 +0,0 @@ -package com.simibubi.create.modules.curiosities.tools; - -import java.util.List; -import java.util.stream.Collectors; - -import com.simibubi.create.AllPackets; -import com.simibubi.create.foundation.item.AbstractToolItem; -import com.simibubi.create.foundation.item.AbstractToolItem.HarvestPacket; - -import net.minecraft.block.Block; -import net.minecraft.block.BlockState; -import net.minecraft.block.Blocks; -import net.minecraft.enchantment.EnchantmentHelper; -import net.minecraft.enchantment.Enchantments; -import net.minecraft.entity.Entity; -import net.minecraft.entity.item.ItemEntity; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.entity.player.ServerPlayerEntity; -import net.minecraft.item.IItemTier; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.item.TieredItem; -import net.minecraft.nbt.CompoundNBT; -import net.minecraft.util.EntityDamageSource; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.IWorld; -import net.minecraft.world.World; -import net.minecraft.world.server.ServerWorld; -import net.minecraft.world.storage.loot.LootContext.Builder; -import net.minecraft.world.storage.loot.LootParameters; -import net.minecraftforge.event.entity.living.LivingDropsEvent; -import net.minecraftforge.event.entity.living.LivingEvent.LivingUpdateEvent; -import net.minecraftforge.event.entity.living.LivingExperienceDropEvent; -import net.minecraftforge.event.world.BlockEvent; -import net.minecraftforge.eventbus.api.Event.Result; -import net.minecraftforge.eventbus.api.EventPriority; -import net.minecraftforge.eventbus.api.SubscribeEvent; -import net.minecraftforge.fml.common.Mod.EventBusSubscriber; -import net.minecraftforge.fml.network.PacketDistributor; - -@EventBusSubscriber -public class ToolEvents { - - @SubscribeEvent(priority = EventPriority.LOWEST) - public static void toolsCanModifyBlockDrops(BlockEvent.BreakEvent event) { - if (event.isCanceled()) - return; - PlayerEntity player = event.getPlayer(); - ItemStack held = player.getHeldItemMainhand(); - if (player.isCreative()) - return; - if (!(held.getItem() instanceof AbstractToolItem)) - return; - AbstractToolItem tool = (AbstractToolItem) held.getItem(); - if (!tool.modifiesDrops()) - return; - BlockState state = event.getState(); - if (!tool.canHarvestBlock(held, state) && !state.getMaterial().isToolNotRequired()) - return; - - IWorld world = event.getWorld(); - BlockPos pos = event.getPos(); - boolean onServer = !world.isRemote(); - - if (!onServer) { - tool.spawnParticles(world, pos, held, state); - return; - } - - World actualWorld = world.getWorld(); - if (!(actualWorld instanceof ServerWorld)) - return; - - List drops = state.getDrops(new Builder((ServerWorld) actualWorld) - .withRandom(actualWorld.getRandom()).withParameter(LootParameters.POSITION, pos) - .withParameter(LootParameters.TOOL, held).withParameter(LootParameters.THIS_ENTITY, player) - .withNullableParameter(LootParameters.BLOCK_ENTITY, world.getTileEntity(pos))); - - tool.modifyDrops(drops, world, pos, held, state); - tool.onBlockDestroyed(held, actualWorld, state, pos, player); - world.setBlockState(pos, Blocks.AIR.getDefaultState(), 3); - for (ItemStack dropped : drops) - Block.spawnAsEntity(actualWorld, pos, dropped); - - AllPackets.channel.send(PacketDistributor.TRACKING_ENTITY.with(() -> player), - new HarvestPacket(state, held, pos, false)); - AllPackets.channel.send(PacketDistributor.PLAYER.with(() -> (ServerPlayerEntity) player), - new HarvestPacket(state, held, pos, true)); - event.setResult(Result.DENY); - } - - @SubscribeEvent - public static void holdingRoseQuartzToolIncreasesRange(LivingUpdateEvent event) { - if (!(event.getEntity() instanceof PlayerEntity)) - return; - if (event.isCanceled()) - return; - - PlayerEntity player = (PlayerEntity) event.getEntityLiving(); - ItemStack heldItemMainhand = player.getHeldItemMainhand(); - String marker = "create_roseQuartzRange"; - CompoundNBT persistentData = player.getPersistentData(); - Item item = heldItemMainhand.getItem(); - boolean holdingRoseQuartz = - item instanceof TieredItem && ((TieredItem) item).getTier() == AllToolTiers.ROSE_QUARTZ; - - if (!holdingRoseQuartz) { - if (persistentData.contains(marker)) { - player.getAttributes().removeAttributeModifiers(RoseQuartzToolItem.rangeModifier); - persistentData.remove(marker); - } - return; - } - - if (!persistentData.contains(marker)) { - player.getAttributes().applyAttributeModifiers(RoseQuartzToolItem.rangeModifier); - persistentData.putBoolean(marker, true); - } - } - - @SubscribeEvent - public static void toolsMayModifyEntityLoot(LivingDropsEvent event) { - if (!(event.getSource() instanceof EntityDamageSource)) - return; - - EntityDamageSource source = (EntityDamageSource) event.getSource(); - Entity target = event.getEntity(); - Entity trueSource = source.getTrueSource(); - World world = target.getEntityWorld(); - - if (trueSource != null && trueSource instanceof PlayerEntity) { - PlayerEntity player = (PlayerEntity) trueSource; - ItemStack heldItemMainhand = player.getHeldItemMainhand(); - Item item = heldItemMainhand.getItem(); - IItemTier tier = item instanceof TieredItem ? ((TieredItem) item).getTier() : null; - - if (tier == AllToolTiers.SHADOW_STEEL) - event.setCanceled(true); - - if (tier == AllToolTiers.BLAZING) { - List drops = event.getDrops().stream().map(entity -> { - ItemStack stack = entity.getItem(); - entity.remove(); - return stack; - }).collect(Collectors.toList()); - - drops = BlazingToolItem.smeltDrops(drops, world, 0); - - event.getDrops().clear(); - drops.stream().map(stack -> { - ItemEntity entity = new ItemEntity(world, target.getX(), target.getY(), target.getZ(), stack); - world.addEntity(entity); - return entity; - }).forEach(event.getDrops()::add); - } - - } - } - - @SubscribeEvent - public static void shadowSteelToolsDropMoreXPonKill(LivingExperienceDropEvent event) { - PlayerEntity attackingPlayer = event.getAttackingPlayer(); - if (attackingPlayer == null) - return; - ItemStack heldItemMainhand = attackingPlayer.getHeldItemMainhand(); - Item item = heldItemMainhand.getItem(); - IItemTier tier = item instanceof TieredItem ? ((TieredItem) item).getTier() : null; - - if (tier == AllToolTiers.SHADOW_STEEL) { - int level = EnchantmentHelper.getEnchantmentLevel(Enchantments.LOOTING, heldItemMainhand); - float modifier = 1 + event.getEntity().world.getRandom().nextFloat() * level; - event.setDroppedExperience((int) (event.getDroppedExperience() * modifier + .4f)); - } - } - -} diff --git a/src/main/java/com/simibubi/create/modules/palettes/AllPaletteBlocks.java b/src/main/java/com/simibubi/create/modules/palettes/AllPaletteBlocks.java index b5a834e4a..28cee7fd9 100644 --- a/src/main/java/com/simibubi/create/modules/palettes/AllPaletteBlocks.java +++ b/src/main/java/com/simibubi/create/modules/palettes/AllPaletteBlocks.java @@ -90,6 +90,7 @@ public class AllPaletteBlocks { public static final BlockEntry LIMESAND = REGISTRATE.block("limesand", p -> new SandBlock(0xD7D7C7, p)) .initialProperties(() -> Blocks.SAND) .blockstate(palettesCubeAll()) + .simpleItem() .register(); public static final BlockEntry LIMESTONE = diff --git a/src/main/resources/assets/create/blockstates/logistical_casing.json b/src/main/resources/assets/create/blockstates/logistical_casing.json deleted file mode 100644 index 79f130362..000000000 --- a/src/main/resources/assets/create/blockstates/logistical_casing.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "forge_marker": 1, - "variants": { - "active": { - "true": {}, - "false": {} - }, - "part": { - "none": { "model": "create:block/logistical_casing" }, - "start": { "model": "create:block/logistical_casing_start" }, - "middle": { "model": "create:block/logistical_casing_middle" }, - "end": { "model": "create:block/logistical_casing_end" } - }, - "axis": { - "y": {}, - "x": { "x": 90, "y": 90 }, - "z": { "x": 270 } - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/create/blockstates/logistical_controller.json b/src/main/resources/assets/create/blockstates/logistical_controller.json deleted file mode 100644 index 53243b74e..000000000 --- a/src/main/resources/assets/create/blockstates/logistical_controller.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "variants": { - "facing=north": { "model": "create:block/logistical_controller", "y": 180 }, - "facing=south": { "model": "create:block/logistical_controller" }, - "facing=west": { "model": "create:block/logistical_controller", "y": 90 }, - "facing=up": { "model": "create:block/logistical_controller", "x": 90 }, - "facing=down": { "model": "create:block/logistical_controller", "x": 270 }, - "facing=east": { "model": "create:block/logistical_controller", "y": 270 } - } -} diff --git a/src/main/resources/assets/create/blockstates/logistical_controller_indicator.json b/src/main/resources/assets/create/blockstates/logistical_controller_indicator.json deleted file mode 100644 index 58ee7dab8..000000000 --- a/src/main/resources/assets/create/blockstates/logistical_controller_indicator.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "forge_marker": 1, - "variants": { - "type": { - "storage": { "model": "create:block/logistical_controller_icon_storage" }, - "calculation": { "model": "create:block/logistical_controller_icon_calculation" }, - "supply": { "model": "create:block/logistical_controller_icon_supply" }, - "transactions": { "model": "create:block/logistical_controller_icon_transactions" }, - "request": { "model": "create:block/logistical_controller_icon_request" } - }, - "facing": { - "north": { "y": 180 }, - "south": { }, - "west": { "y": 90 }, - "up": { "x": 90 }, - "down": { "x": 270 }, - "east": { "y": 270 } - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/create/blockstates/logistical_index.json b/src/main/resources/assets/create/blockstates/logistical_index.json deleted file mode 100644 index bfba422b7..000000000 --- a/src/main/resources/assets/create/blockstates/logistical_index.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "variants": { - "facing=north": { "model": "create:block/logistical_index", "y": 180 }, - "facing=south": { "model": "create:block/logistical_index" }, - "facing=east": { "model": "create:block/logistical_index", "y": 270 }, - "facing=west": { "model": "create:block/logistical_index", "y": 90 } - } -} diff --git a/src/main/resources/assets/create/blockstates/logisticians_table.json b/src/main/resources/assets/create/blockstates/logisticians_table.json deleted file mode 100644 index 8e93f0139..000000000 --- a/src/main/resources/assets/create/blockstates/logisticians_table.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "variants": { - "facing=north": { "model": "create:block/logisticians_table", "y": 180 }, - "facing=south": { "model": "create:block/logisticians_table" }, - "facing=east": { "model": "create:block/logisticians_table", "y": 270 }, - "facing=west": { "model": "create:block/logisticians_table", "y": 90 } - } -} diff --git a/src/main/resources/assets/create/blockstates/logisticians_table_indicator.json b/src/main/resources/assets/create/blockstates/logisticians_table_indicator.json deleted file mode 100644 index a35102a36..000000000 --- a/src/main/resources/assets/create/blockstates/logisticians_table_indicator.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "variants": { - "": { "model": "create:block/logisticians_table_indicator" } - } -} diff --git a/src/main/resources/assets/create/blockstates/package_funnel.json b/src/main/resources/assets/create/blockstates/package_funnel.json deleted file mode 100644 index 7db7c69df..000000000 --- a/src/main/resources/assets/create/blockstates/package_funnel.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "variants": { - "facing=north": { "model": "create:block/package_funnel", "y": 180 }, - "facing=south": { "model": "create:block/package_funnel" }, - "facing=west": { "model": "create:block/package_funnel", "y": 90 }, - "facing=up": { "model": "create:block/package_funnel_vertical", "x": 90 }, - "facing=down": { "model": "create:block/package_funnel_vertical", "x": 270 }, - "facing=east": { "model": "create:block/package_funnel", "y": 270 } - } -} diff --git a/src/main/resources/assets/create/models/item/blazing_axe.json b/src/main/resources/assets/create/models/item/blazing_axe.json deleted file mode 100644 index f2753b186..000000000 --- a/src/main/resources/assets/create/models/item/blazing_axe.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/handheld", - "textures": { - "layer0": "create:item/blazing_axe" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/item/blazing_pickaxe.json b/src/main/resources/assets/create/models/item/blazing_pickaxe.json deleted file mode 100644 index d2f77a6f2..000000000 --- a/src/main/resources/assets/create/models/item/blazing_pickaxe.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/handheld", - "textures": { - "layer0": "create:item/blazing_pickaxe" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/item/blazing_shovel.json b/src/main/resources/assets/create/models/item/blazing_shovel.json deleted file mode 100644 index 74a0e7764..000000000 --- a/src/main/resources/assets/create/models/item/blazing_shovel.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/handheld", - "textures": { - "layer0": "create:item/blazing_shovel" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/item/blazing_sword.json b/src/main/resources/assets/create/models/item/blazing_sword.json deleted file mode 100644 index a9f09f5bc..000000000 --- a/src/main/resources/assets/create/models/item/blazing_sword.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/handheld", - "textures": { - "layer0": "create:item/blazing_sword" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/item/cardboard_box.json b/src/main/resources/assets/create/models/item/cardboard_box.json deleted file mode 100644 index 6d869a72b..000000000 --- a/src/main/resources/assets/create/models/item/cardboard_box.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "__comment": "Model generated using MrCrayfish's Model Creator (https://mrcrayfish.com/tools?id=mc)", - "parent": "block/block", - "textures": { - "particle": "create:entity/cardboard_box/particle", - "cardboard_box_1410": "create:entity/cardboard_box/box_1410" - }, - "elements": [ - { - "name": "Box", - "from": [ 1, 0, 1 ], - "to": [ 15, 10, 15 ], - "faces": { - "north": { "texture": "#cardboard_box_1410", "uv": [ 8, 8, 15, 13 ] }, - "east": { "texture": "#cardboard_box_1410", "uv": [ 1, 3, 8, 8 ] }, - "south": { "texture": "#cardboard_box_1410", "uv": [ 8, 8, 15, 13 ] }, - "west": { "texture": "#cardboard_box_1410", "uv": [ 1, 3, 8, 8 ] }, - "up": { "texture": "#cardboard_box_1410", "uv": [ 8, 1, 15, 8 ] }, - "down": { "texture": "#cardboard_box_1410", "uv": [ 1, 8, 8, 15 ] } - } - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/item/cardboard_box_1.json b/src/main/resources/assets/create/models/item/cardboard_box_1.json deleted file mode 100644 index ca995b30d..000000000 --- a/src/main/resources/assets/create/models/item/cardboard_box_1.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "__comment": "Model generated using MrCrayfish's Model Creator (https://mrcrayfish.com/tools?id=mc)", - "parent": "block/block", - "textures": { - "particle": "create:entity/cardboard_box/particle", - "cardboard_box_1416": "create:entity/cardboard_box/box_1416" - }, - "elements": [ - { - "name": "Box", - "from": [ 1, 0, 1 ], - "to": [ 15, 16, 15 ], - "faces": { - "north": { "texture": "#cardboard_box_1416", "uv": [ 8, 8, 15, 16 ] }, - "east": { "texture": "#cardboard_box_1416", "uv": [ 1, 0, 8, 8 ] }, - "south": { "texture": "#cardboard_box_1416", "uv": [ 8, 8, 15, 16 ] }, - "west": { "texture": "#cardboard_box_1416", "uv": [ 1, 0, 8, 8 ] }, - "up": { "texture": "#cardboard_box_1416", "uv": [ 8, 1, 15, 8 ] }, - "down": { "texture": "#cardboard_box_1416", "uv": [ 1, 8, 8, 15 ] } - } - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/item/cardboard_box_2.json b/src/main/resources/assets/create/models/item/cardboard_box_2.json deleted file mode 100644 index 38aa4dfe5..000000000 --- a/src/main/resources/assets/create/models/item/cardboard_box_2.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "__comment": "Model generated using MrCrayfish's Model Creator (https://mrcrayfish.com/tools?id=mc)", - "parent": "block/block", - "textures": { - "particle": "create:entity/cardboard_box/particle", - "cardboard_box_1612": "create:entity/cardboard_box/box_1612" - }, - "elements": [ - { - "name": "Box", - "from": [ 0, 0, 0 ], - "to": [ 16, 12, 16 ], - "faces": { - "north": { "texture": "#cardboard_box_1612", "uv": [ 8, 8, 16, 14 ] }, - "east": { "texture": "#cardboard_box_1612", "uv": [ 0, 2, 8, 8 ] }, - "south": { "texture": "#cardboard_box_1612", "uv": [ 8, 8, 16, 14 ] }, - "west": { "texture": "#cardboard_box_1612", "uv": [ 0, 2, 8, 8 ] }, - "up": { "texture": "#cardboard_box_1612", "uv": [ 8, 0, 16, 8 ] }, - "down": { "texture": "#cardboard_box_1612", "uv": [ 0, 8, 8, 16 ] } - } - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/item/cardboard_box_3.json b/src/main/resources/assets/create/models/item/cardboard_box_3.json deleted file mode 100644 index fff74d2ec..000000000 --- a/src/main/resources/assets/create/models/item/cardboard_box_3.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "__comment": "Model generated using MrCrayfish's Model Creator (https://mrcrayfish.com/tools?id=mc)", - "parent": "block/block", - "textures": { - "particle": "create:entity/cardboard_box/particle", - "cardboard_box_1616": "create:entity/cardboard_box/box_1616" - }, - "elements": [ - { - "name": "Box", - "from": [ 0, 0, 0 ], - "to": [ 16, 16, 16 ], - "faces": { - "north": { "texture": "#cardboard_box_1616", "uv": [ 8, 8, 16, 16 ] }, - "east": { "texture": "#cardboard_box_1616", "uv": [ 0, 0, 8, 8 ] }, - "south": { "texture": "#cardboard_box_1616", "uv": [ 8, 8, 16, 16 ] }, - "west": { "texture": "#cardboard_box_1616", "uv": [ 0, 0, 8, 8 ] }, - "up": { "texture": "#cardboard_box_1616", "uv": [ 8, 0, 16, 8 ] }, - "down": { "texture": "#cardboard_box_1616", "uv": [ 0, 8, 8, 16 ] } - } - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/item/logistical_casing.json b/src/main/resources/assets/create/models/item/logistical_casing.json deleted file mode 100644 index 9c287f452..000000000 --- a/src/main/resources/assets/create/models/item/logistical_casing.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "create:block/logistical_casing" -} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/item/logistical_controller.json b/src/main/resources/assets/create/models/item/logistical_controller.json deleted file mode 100644 index c8bfaadc5..000000000 --- a/src/main/resources/assets/create/models/item/logistical_controller.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "__comment": "Model generated using MrCrayfish's Model Creator (https://mrcrayfish.com/tools?id=mc)", - "parent": "block/block", - "textures": { - "particle": "create:block/logistical_controller", - "logistical_controller": "create:block/logistical_controller", - "logistical_icons_1": "create:block/logistical_icons_1" - }, - "display": { - "gui": { - "rotation": [ 30, 45, 0 ], - "translation": [ 2.6, -1, 0 ], - "scale": [ 0.625, 0.625, 0.625 ] - }, - "ground": { - "rotation": [ 0, 0, 0 ], - "translation": [ 0, 3, 2 ], - "scale": [ 0.25, 0.25, 0.25 ] - }, - "fixed": { - "rotation": [ 0, 180, 0 ], - "translation": [ 0, 0, -7 ], - "scale": [ 0.625, 0.625, 0.625 ] - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/item/logistical_controller_calculation.json b/src/main/resources/assets/create/models/item/logistical_controller_calculation.json deleted file mode 100644 index 9bb9d4ae4..000000000 --- a/src/main/resources/assets/create/models/item/logistical_controller_calculation.json +++ /dev/null @@ -1,38 +0,0 @@ -{ - "__comment": "Model generated using MrCrayfish's Model Creator (https://mrcrayfish.com/tools?id=mc)", - "parent": "create:item/logistical_controller", - "elements": [ - { - "name": "Body", - "from": [ 2, 2, -1 ], - "to": [ 14, 14, 3 ], - "faces": { - "north": { "texture": "#logistical_controller", "uv": [ 0, 0, 12, 12 ] }, - "east": { "texture": "#logistical_controller", "uv": [ 12, 0, 16, 12 ] }, - "south": { "texture": "#logistical_controller", "uv": [ 0, 0, 12, 12 ] }, - "west": { "texture": "#logistical_controller", "uv": [ 12, 0, 16, 12 ], "rotation": 180 }, - "up": { "texture": "#logistical_controller", "uv": [ 0, 12, 12, 16 ], "rotation": 180 }, - "down": { "texture": "#logistical_controller", "uv": [ 0, 12, 12, 16 ] } - } - }, - { - "name": "Indicator", - "from": [ 1.99, 3, 0 ], - "to": [ 14.01, 13, 2 ], - "shade": false, - "faces": { - "east": { "texture": "#logistical_controller", "uv": [ 13, 1, 15, 11 ], "tintindex": 0 }, - "west": { "texture": "#logistical_controller", "uv": [ 13, 1, 15, 11 ], "rotation": 180, "tintindex": 0 } - } - }, - { - "name": "Icon", - "from": [ 5, 5, 2.5 ], - "to": [ 11, 11, 3.5 ], - "shade": false, - "faces": { - "south": { "texture": "#logistical_icons_1", "uv": [ 9, 2, 14, 7 ], "tintindex": 1 } - } - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/item/logistical_controller_request.json b/src/main/resources/assets/create/models/item/logistical_controller_request.json deleted file mode 100644 index 67bb689c8..000000000 --- a/src/main/resources/assets/create/models/item/logistical_controller_request.json +++ /dev/null @@ -1,38 +0,0 @@ -{ - "__comment": "Model generated using MrCrayfish's Model Creator (https://mrcrayfish.com/tools?id=mc)", - "parent": "create:item/logistical_controller", - "elements": [ - { - "name": "Body", - "from": [ 2, 2, -1 ], - "to": [ 14, 14, 3 ], - "faces": { - "north": { "texture": "#logistical_controller", "uv": [ 0, 0, 12, 12 ] }, - "east": { "texture": "#logistical_controller", "uv": [ 12, 0, 16, 12 ] }, - "south": { "texture": "#logistical_controller", "uv": [ 0, 0, 12, 12 ] }, - "west": { "texture": "#logistical_controller", "uv": [ 12, 0, 16, 12 ], "rotation": 180 }, - "up": { "texture": "#logistical_controller", "uv": [ 0, 12, 12, 16 ], "rotation": 180 }, - "down": { "texture": "#logistical_controller", "uv": [ 0, 12, 12, 16 ] } - } - }, - { - "name": "Indicator", - "from": [ 1.99, 3, 0 ], - "to": [ 14.01, 13, 2 ], - "shade": false, - "faces": { - "east": { "texture": "#logistical_controller", "uv": [ 13, 1, 15, 11 ], "tintindex": 0 }, - "west": { "texture": "#logistical_controller", "uv": [ 13, 1, 15, 11 ], "rotation": 180, "tintindex": 0 } - } - }, - { - "name": "Icon", - "from": [ 5, 5, 2.5 ], - "to": [ 11, 11, 3.5 ], - "shade": false, - "faces": { - "south": { "texture": "#logistical_icons_1", "uv": [ 9, 9, 14, 14 ], "tintindex": 1 } - } - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/item/logistical_controller_storage.json b/src/main/resources/assets/create/models/item/logistical_controller_storage.json deleted file mode 100644 index f9279f0e4..000000000 --- a/src/main/resources/assets/create/models/item/logistical_controller_storage.json +++ /dev/null @@ -1,38 +0,0 @@ -{ - "__comment": "Model generated using MrCrayfish's Model Creator (https://mrcrayfish.com/tools?id=mc)", - "parent": "create:item/logistical_controller", - "elements": [ - { - "name": "Body", - "from": [ 2, 2, -1 ], - "to": [ 14, 14, 3 ], - "faces": { - "north": { "texture": "#logistical_controller", "uv": [ 0, 0, 12, 12 ] }, - "east": { "texture": "#logistical_controller", "uv": [ 12, 0, 16, 12 ] }, - "south": { "texture": "#logistical_controller", "uv": [ 0, 0, 12, 12 ] }, - "west": { "texture": "#logistical_controller", "uv": [ 12, 0, 16, 12 ], "rotation": 180 }, - "up": { "texture": "#logistical_controller", "uv": [ 0, 12, 12, 16 ], "rotation": 180 }, - "down": { "texture": "#logistical_controller", "uv": [ 0, 12, 12, 16 ] } - } - }, - { - "name": "Indicator", - "from": [ 1.99, 3, 0 ], - "to": [ 14.01, 13, 2 ], - "shade": false, - "faces": { - "east": { "texture": "#logistical_controller", "uv": [ 13, 1, 15, 11 ], "tintindex": 0 }, - "west": { "texture": "#logistical_controller", "uv": [ 13, 1, 15, 11 ], "rotation": 180, "tintindex": 0 } - } - }, - { - "name": "Icon", - "from": [ 5, 5, 2.5 ], - "to": [ 11, 11, 3.5 ], - "shade": false, - "faces": { - "south": { "texture": "#logistical_icons_1", "uv": [ 2, 2, 7, 7 ], "tintindex": 1 } - } - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/item/logistical_controller_supply.json b/src/main/resources/assets/create/models/item/logistical_controller_supply.json deleted file mode 100644 index 7b2c305cf..000000000 --- a/src/main/resources/assets/create/models/item/logistical_controller_supply.json +++ /dev/null @@ -1,38 +0,0 @@ -{ - "__comment": "Model generated using MrCrayfish's Model Creator (https://mrcrayfish.com/tools?id=mc)", - "parent": "create:item/logistical_controller", - "elements": [ - { - "name": "Body", - "from": [ 2, 2, -1 ], - "to": [ 14, 14, 3 ], - "faces": { - "north": { "texture": "#logistical_controller", "uv": [ 0, 0, 12, 12 ] }, - "east": { "texture": "#logistical_controller", "uv": [ 12, 0, 16, 12 ] }, - "south": { "texture": "#logistical_controller", "uv": [ 0, 0, 12, 12 ] }, - "west": { "texture": "#logistical_controller", "uv": [ 12, 0, 16, 12 ], "rotation": 180 }, - "up": { "texture": "#logistical_controller", "uv": [ 0, 12, 12, 16 ], "rotation": 180 }, - "down": { "texture": "#logistical_controller", "uv": [ 0, 12, 12, 16 ] } - } - }, - { - "name": "Indicator", - "from": [ 1.99, 3, 0 ], - "to": [ 14.01, 13, 2 ], - "shade": false, - "faces": { - "east": { "texture": "#logistical_controller", "uv": [ 13, 1, 15, 11 ], "tintindex": 0 }, - "west": { "texture": "#logistical_controller", "uv": [ 13, 1, 15, 11 ], "rotation": 180, "tintindex": 0 } - } - }, - { - "name": "Icon", - "from": [ 5, 5, 2.5 ], - "to": [ 11, 11, 3.5 ], - "shade": false, - "faces": { - "south": { "texture": "#logistical_icons_1", "uv": [ 2, 9, 7, 14 ], "tintindex": 1 } - } - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/item/logistical_controller_transactions.json b/src/main/resources/assets/create/models/item/logistical_controller_transactions.json deleted file mode 100644 index f7c9c725b..000000000 --- a/src/main/resources/assets/create/models/item/logistical_controller_transactions.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "create:item/logistical_controller_storage", - "textures": { - "logistical_icons_1": "create:block/logistical_icons_2" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/item/logistical_dial.json b/src/main/resources/assets/create/models/item/logistical_dial.json deleted file mode 100644 index a31bb13a8..000000000 --- a/src/main/resources/assets/create/models/item/logistical_dial.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "create:item/logistical_dial", - "layer1": "create:item/logistical_dial_overlay" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/item/logistical_filter.json b/src/main/resources/assets/create/models/item/logistical_filter.json deleted file mode 100644 index 709b0ab34..000000000 --- a/src/main/resources/assets/create/models/item/logistical_filter.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "create:item/filter", - "textures": { - "0": "create:item/logistical_filter", - "particle": "create:item/logistical_filter" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/item/logistical_index.json b/src/main/resources/assets/create/models/item/logistical_index.json deleted file mode 100644 index 593ef575a..000000000 --- a/src/main/resources/assets/create/models/item/logistical_index.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "parent": "create:block/logistical_index", - "display": { - "gui": { - "rotation": [ 30, 45, 0 ], - "translation": [ 2.6, -1, 0 ], - "scale": [ 0.625, 0.625, 0.625 ] - }, - "ground": { - "rotation": [ 0, 0, 0 ], - "translation": [ 0, 3, 2 ], - "scale": [ 0.25, 0.25, 0.25 ] - }, - "fixed": { - "rotation": [ 0, 180, 0 ], - "translation": [ 0, 0, -7 ], - "scale": [ 0.625, 0.625, 0.625 ] - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/item/logisticians_table.json b/src/main/resources/assets/create/models/item/logisticians_table.json deleted file mode 100644 index 00a18489e..000000000 --- a/src/main/resources/assets/create/models/item/logisticians_table.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "create:block/logisticians_table" -} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/item/package_funnel.json b/src/main/resources/assets/create/models/item/package_funnel.json deleted file mode 100644 index 2a55220b0..000000000 --- a/src/main/resources/assets/create/models/item/package_funnel.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "create:block/package_funnel" -} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/item/rose_quartz_axe.json b/src/main/resources/assets/create/models/item/rose_quartz_axe.json deleted file mode 100644 index c3b3aa30f..000000000 --- a/src/main/resources/assets/create/models/item/rose_quartz_axe.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "create:item/rose_quartz_tool", - "textures": { - "layer0": "create:item/rose_quartz_axe" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/item/rose_quartz_pickaxe.json b/src/main/resources/assets/create/models/item/rose_quartz_pickaxe.json deleted file mode 100644 index 8d7613cdb..000000000 --- a/src/main/resources/assets/create/models/item/rose_quartz_pickaxe.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "create:item/rose_quartz_tool", - "textures": { - "layer0": "create:item/rose_quartz_pickaxe" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/item/rose_quartz_shovel.json b/src/main/resources/assets/create/models/item/rose_quartz_shovel.json deleted file mode 100644 index f0104a9c7..000000000 --- a/src/main/resources/assets/create/models/item/rose_quartz_shovel.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "create:item/rose_quartz_tool", - "textures": { - "layer0": "create:item/rose_quartz_shovel" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/item/rose_quartz_sword.json b/src/main/resources/assets/create/models/item/rose_quartz_sword.json deleted file mode 100644 index 662c0b608..000000000 --- a/src/main/resources/assets/create/models/item/rose_quartz_sword.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "create:item/rose_quartz_tool", - "textures": { - "layer0": "create:item/rose_quartz_sword" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/item/rose_quartz_tool.json b/src/main/resources/assets/create/models/item/rose_quartz_tool.json deleted file mode 100644 index 0125bcbb4..000000000 --- a/src/main/resources/assets/create/models/item/rose_quartz_tool.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "parent": "item/handheld", - "display": { - "firstperson_righthand": { - "rotation": [ 0, -90, 25 ], - "translation": [ 1.13, 4.2, 1.13 ], - "scale": [ 0.68, 0.68, 0.68 ] - }, - "firstperson_lefthand": { - "rotation": [ 0, 90, -25 ], - "translation": [ 1.13, 4.2, 1.13 ], - "scale": [ 0.68, 0.68, 0.68 ] - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/item/shadow_steel_mattock.json b/src/main/resources/assets/create/models/item/shadow_steel_mattock.json deleted file mode 100644 index ae9c61d63..000000000 --- a/src/main/resources/assets/create/models/item/shadow_steel_mattock.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/handheld", - "textures": { - "layer0": "create:item/shadow_steel_mattock" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/item/shadow_steel_pickaxe.json b/src/main/resources/assets/create/models/item/shadow_steel_pickaxe.json deleted file mode 100644 index 0deaa8d20..000000000 --- a/src/main/resources/assets/create/models/item/shadow_steel_pickaxe.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/handheld", - "textures": { - "layer0": "create:item/shadow_steel_pickaxe" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/item/shadow_steel_sword.json b/src/main/resources/assets/create/models/item/shadow_steel_sword.json deleted file mode 100644 index d963d6302..000000000 --- a/src/main/resources/assets/create/models/item/shadow_steel_sword.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/handheld", - "textures": { - "layer0": "create:item/shadow_steel_sword" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/item/zinc_handle.json b/src/main/resources/assets/create/models/item/zinc_handle.json deleted file mode 100644 index dd8fe372f..000000000 --- a/src/main/resources/assets/create/models/item/zinc_handle.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "create:item/tool_handle" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/create/textures/block/connected/andesite_casing.png b/src/main/resources/assets/create/textures/block/andesite_casing_connected.png similarity index 100% rename from src/main/resources/assets/create/textures/block/connected/andesite_casing.png rename to src/main/resources/assets/create/textures/block/andesite_casing_connected.png diff --git a/src/main/resources/assets/create/textures/block/connected/brass_casing.png b/src/main/resources/assets/create/textures/block/brass_casing_connected.png similarity index 100% rename from src/main/resources/assets/create/textures/block/connected/brass_casing.png rename to src/main/resources/assets/create/textures/block/brass_casing_connected.png diff --git a/src/main/resources/assets/create/textures/block/connected/copper_casing.png b/src/main/resources/assets/create/textures/block/copper_casing_connected.png similarity index 100% rename from src/main/resources/assets/create/textures/block/connected/copper_casing.png rename to src/main/resources/assets/create/textures/block/copper_casing_connected.png diff --git a/src/main/resources/assets/create/textures/block/connected/crafter_side.png b/src/main/resources/assets/create/textures/block/crafter_side_connected.png similarity index 100% rename from src/main/resources/assets/create/textures/block/connected/crafter_side.png rename to src/main/resources/assets/create/textures/block/crafter_side_connected.png diff --git a/src/main/resources/assets/create/textures/block/logistical_controller.png b/src/main/resources/assets/create/textures/block/logistical_controller.png deleted file mode 100644 index 6dbc79bc2..000000000 Binary files a/src/main/resources/assets/create/textures/block/logistical_controller.png and /dev/null differ diff --git a/src/main/resources/assets/create/textures/block/logistical_icons_1.png b/src/main/resources/assets/create/textures/block/logistical_icons_1.png deleted file mode 100644 index 48bca3161..000000000 Binary files a/src/main/resources/assets/create/textures/block/logistical_icons_1.png and /dev/null differ diff --git a/src/main/resources/assets/create/textures/block/logistical_icons_2.png b/src/main/resources/assets/create/textures/block/logistical_icons_2.png deleted file mode 100644 index 02f695d60..000000000 Binary files a/src/main/resources/assets/create/textures/block/logistical_icons_2.png and /dev/null differ diff --git a/src/main/resources/assets/create/textures/block/logistical_index_side.png b/src/main/resources/assets/create/textures/block/logistical_index_side.png deleted file mode 100644 index 8adfcb545..000000000 Binary files a/src/main/resources/assets/create/textures/block/logistical_index_side.png and /dev/null differ diff --git a/src/main/resources/assets/create/textures/block/logistical_index_side_overlay.png b/src/main/resources/assets/create/textures/block/logistical_index_side_overlay.png deleted file mode 100644 index e4cb74f29..000000000 Binary files a/src/main/resources/assets/create/textures/block/logistical_index_side_overlay.png and /dev/null differ diff --git a/src/main/resources/assets/create/textures/block/connected/translation_chassis_top.png b/src/main/resources/assets/create/textures/block/translation_chassis_top_connected.png similarity index 100% rename from src/main/resources/assets/create/textures/block/connected/translation_chassis_top.png rename to src/main/resources/assets/create/textures/block/translation_chassis_top_connected.png diff --git a/src/main/resources/assets/create/textures/block/connected/translation_chassis_top_sticky.png b/src/main/resources/assets/create/textures/block/translation_chassis_top_sticky_connected.png similarity index 100% rename from src/main/resources/assets/create/textures/block/connected/translation_chassis_top_sticky.png rename to src/main/resources/assets/create/textures/block/translation_chassis_top_sticky_connected.png diff --git a/src/main/resources/assets/create/textures/entity/cardboard_box/box_1410.png b/src/main/resources/assets/create/textures/entity/cardboard_box/box_1410.png deleted file mode 100644 index 6ba4fffaf..000000000 Binary files a/src/main/resources/assets/create/textures/entity/cardboard_box/box_1410.png and /dev/null differ diff --git a/src/main/resources/assets/create/textures/entity/cardboard_box/box_1416.png b/src/main/resources/assets/create/textures/entity/cardboard_box/box_1416.png deleted file mode 100644 index 557a39a9c..000000000 Binary files a/src/main/resources/assets/create/textures/entity/cardboard_box/box_1416.png and /dev/null differ diff --git a/src/main/resources/assets/create/textures/entity/cardboard_box/box_1612.png b/src/main/resources/assets/create/textures/entity/cardboard_box/box_1612.png deleted file mode 100644 index 629f10cc3..000000000 Binary files a/src/main/resources/assets/create/textures/entity/cardboard_box/box_1612.png and /dev/null differ diff --git a/src/main/resources/assets/create/textures/entity/cardboard_box/box_1616.png b/src/main/resources/assets/create/textures/entity/cardboard_box/box_1616.png deleted file mode 100644 index f54db54c6..000000000 Binary files a/src/main/resources/assets/create/textures/entity/cardboard_box/box_1616.png and /dev/null differ diff --git a/src/main/resources/assets/create/textures/entity/cardboard_box/particle.png b/src/main/resources/assets/create/textures/entity/cardboard_box/particle.png deleted file mode 100644 index 86e078106..000000000 Binary files a/src/main/resources/assets/create/textures/entity/cardboard_box/particle.png and /dev/null differ diff --git a/src/main/resources/assets/create/textures/entity/villager/profession/logistician.png b/src/main/resources/assets/create/textures/entity/villager/profession/logistician.png deleted file mode 100644 index 6cb34c6c6..000000000 Binary files a/src/main/resources/assets/create/textures/entity/villager/profession/logistician.png and /dev/null differ diff --git a/src/main/resources/assets/create/textures/entity/villager/profession/logistician.png.mcmeta b/src/main/resources/assets/create/textures/entity/villager/profession/logistician.png.mcmeta deleted file mode 100644 index f24387e76..000000000 --- a/src/main/resources/assets/create/textures/entity/villager/profession/logistician.png.mcmeta +++ /dev/null @@ -1,5 +0,0 @@ -{ - "villager": { - "hat": "full" - } -} diff --git a/src/main/resources/assets/create/textures/gui/controller.png b/src/main/resources/assets/create/textures/gui/controller.png deleted file mode 100644 index 9cf860e23..000000000 Binary files a/src/main/resources/assets/create/textures/gui/controller.png and /dev/null differ diff --git a/src/main/resources/assets/create/textures/gui/index.pdn b/src/main/resources/assets/create/textures/gui/index.pdn deleted file mode 100644 index d9c63a53f..000000000 Binary files a/src/main/resources/assets/create/textures/gui/index.pdn and /dev/null differ diff --git a/src/main/resources/assets/create/textures/gui/index.png b/src/main/resources/assets/create/textures/gui/index.png deleted file mode 100644 index 9a8c423fb..000000000 Binary files a/src/main/resources/assets/create/textures/gui/index.png and /dev/null differ diff --git a/src/main/resources/assets/create/textures/item/blazing_axe.png b/src/main/resources/assets/create/textures/item/blazing_axe.png deleted file mode 100644 index 59208d6f7..000000000 Binary files a/src/main/resources/assets/create/textures/item/blazing_axe.png and /dev/null differ diff --git a/src/main/resources/assets/create/textures/item/blazing_pickaxe.png b/src/main/resources/assets/create/textures/item/blazing_pickaxe.png deleted file mode 100644 index 2c93f5fa5..000000000 Binary files a/src/main/resources/assets/create/textures/item/blazing_pickaxe.png and /dev/null differ diff --git a/src/main/resources/assets/create/textures/item/blazing_shovel.png b/src/main/resources/assets/create/textures/item/blazing_shovel.png deleted file mode 100644 index a3818ad5d..000000000 Binary files a/src/main/resources/assets/create/textures/item/blazing_shovel.png and /dev/null differ diff --git a/src/main/resources/assets/create/textures/item/blazing_sword.png b/src/main/resources/assets/create/textures/item/blazing_sword.png deleted file mode 100644 index de0ab94a7..000000000 Binary files a/src/main/resources/assets/create/textures/item/blazing_sword.png and /dev/null differ diff --git a/src/main/resources/assets/create/textures/item/rose_quartz_axe.png b/src/main/resources/assets/create/textures/item/rose_quartz_axe.png deleted file mode 100644 index 68916ea3a..000000000 Binary files a/src/main/resources/assets/create/textures/item/rose_quartz_axe.png and /dev/null differ diff --git a/src/main/resources/assets/create/textures/item/rose_quartz_pickaxe.png b/src/main/resources/assets/create/textures/item/rose_quartz_pickaxe.png deleted file mode 100644 index 33445e315..000000000 Binary files a/src/main/resources/assets/create/textures/item/rose_quartz_pickaxe.png and /dev/null differ diff --git a/src/main/resources/assets/create/textures/item/rose_quartz_shovel.png b/src/main/resources/assets/create/textures/item/rose_quartz_shovel.png deleted file mode 100644 index 7f95d3ab4..000000000 Binary files a/src/main/resources/assets/create/textures/item/rose_quartz_shovel.png and /dev/null differ diff --git a/src/main/resources/assets/create/textures/item/rose_quartz_sword.png b/src/main/resources/assets/create/textures/item/rose_quartz_sword.png deleted file mode 100644 index 91e06448e..000000000 Binary files a/src/main/resources/assets/create/textures/item/rose_quartz_sword.png and /dev/null differ diff --git a/src/main/resources/assets/create/textures/item/shadow_steel_mattock.png b/src/main/resources/assets/create/textures/item/shadow_steel_mattock.png deleted file mode 100644 index 7e8137258..000000000 Binary files a/src/main/resources/assets/create/textures/item/shadow_steel_mattock.png and /dev/null differ diff --git a/src/main/resources/assets/create/textures/item/shadow_steel_pickaxe.png b/src/main/resources/assets/create/textures/item/shadow_steel_pickaxe.png deleted file mode 100644 index 4cbd5b818..000000000 Binary files a/src/main/resources/assets/create/textures/item/shadow_steel_pickaxe.png and /dev/null differ diff --git a/src/main/resources/assets/create/textures/item/shadow_steel_sword.png b/src/main/resources/assets/create/textures/item/shadow_steel_sword.png deleted file mode 100644 index ad87571fe..000000000 Binary files a/src/main/resources/assets/create/textures/item/shadow_steel_sword.png and /dev/null differ diff --git a/src/main/resources/assets/create/textures/item/tool_handle.png b/src/main/resources/assets/create/textures/item/tool_handle.png deleted file mode 100644 index 593558243..000000000 Binary files a/src/main/resources/assets/create/textures/item/tool_handle.png and /dev/null differ diff --git a/src/main/resources/data/create/recipes/crafting_shaped/curiosities/shadow_steel_mattock.json b/src/main/resources/data/create/recipes/crafting_shaped/curiosities/shadow_steel_mattock.json deleted file mode 100644 index e44b90ed0..000000000 --- a/src/main/resources/data/create/recipes/crafting_shaped/curiosities/shadow_steel_mattock.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "crafting_shaped", - "pattern": [ - "PPP", - "PS ", - " S " - ], - "key": { - "S": { - "item": "create:zinc_handle" - }, - "P": { - "item": "create:shadow_steel" - } - }, - "result": { - "item": "create:shadow_steel_mattock", - "count": 1 - } -} \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/crafting_shaped/curiosities/shadow_steel_pickaxe.json b/src/main/resources/data/create/recipes/crafting_shaped/curiosities/shadow_steel_pickaxe.json deleted file mode 100644 index 83d1c42bb..000000000 --- a/src/main/resources/data/create/recipes/crafting_shaped/curiosities/shadow_steel_pickaxe.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "crafting_shaped", - "pattern": [ - "PPP", - " S ", - " S " - ], - "key": { - "S": { - "item": "create:zinc_handle" - }, - "P": { - "item": "create:shadow_steel" - } - }, - "result": { - "item": "create:shadow_steel_pickaxe", - "count": 1 - } -} \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/crafting_shaped/curiosities/shadow_steel_sword.json b/src/main/resources/data/create/recipes/crafting_shaped/curiosities/shadow_steel_sword.json deleted file mode 100644 index 84e02faac..000000000 --- a/src/main/resources/data/create/recipes/crafting_shaped/curiosities/shadow_steel_sword.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "crafting_shaped", - "pattern": [ - "P", - "P", - "S" - ], - "key": { - "S": { - "item": "create:zinc_handle" - }, - "P": { - "item": "create:shadow_steel" - } - }, - "result": { - "item": "create:shadow_steel_sword", - "count": 1 - } -} \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/crafting_shaped/palettes/acacia_glass.json b/src/main/resources/data/create/recipes/crafting_shaped/palettes/acacia_glass.json deleted file mode 100644 index b261917bf..000000000 --- a/src/main/resources/data/create/recipes/crafting_shaped/palettes/acacia_glass.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "crafting_shaped", - "pattern": [ - "LLL", - "LWL", - "LLL" - ], - "key": { - "L": { - "tag": "forge:glass" - }, - "W": { - "item": "minecraft:acacia_planks" - } - }, - "result": { - "item": "create:acacia_glass", - "count": 8 - } -} \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/crafting_shaped/palettes/acacia_glass_pane.json b/src/main/resources/data/create/recipes/crafting_shaped/palettes/acacia_glass_pane.json deleted file mode 100644 index d4733c958..000000000 --- a/src/main/resources/data/create/recipes/crafting_shaped/palettes/acacia_glass_pane.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "crafting_shaped", - "pattern": [ - "SSS", - "SSS" - ], - "key": { - "S": { - "item": "create:acacia_glass" - } - }, - "result": { - "item": "create:acacia_glass_pane", - "count": 16 - } -} \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/crafting_shaped/palettes/birch_glass.json b/src/main/resources/data/create/recipes/crafting_shaped/palettes/birch_glass.json deleted file mode 100644 index 1f133cfcd..000000000 --- a/src/main/resources/data/create/recipes/crafting_shaped/palettes/birch_glass.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "crafting_shaped", - "pattern": [ - "LLL", - "LWL", - "LLL" - ], - "key": { - "L": { - "tag": "forge:glass" - }, - "W": { - "item": "minecraft:birch_planks" - } - }, - "result": { - "item": "create:birch_glass", - "count": 8 - } -} \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/crafting_shaped/palettes/birch_glass_pane.json b/src/main/resources/data/create/recipes/crafting_shaped/palettes/birch_glass_pane.json deleted file mode 100644 index 1f76df04d..000000000 --- a/src/main/resources/data/create/recipes/crafting_shaped/palettes/birch_glass_pane.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "crafting_shaped", - "pattern": [ - "SSS", - "SSS" - ], - "key": { - "S": { - "item": "create:birch_glass" - } - }, - "result": { - "item": "create:birch_glass_pane", - "count": 16 - } -} \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/crafting_shaped/palettes/dark_oak_glass.json b/src/main/resources/data/create/recipes/crafting_shaped/palettes/dark_oak_glass.json deleted file mode 100644 index 414d01b71..000000000 --- a/src/main/resources/data/create/recipes/crafting_shaped/palettes/dark_oak_glass.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "crafting_shaped", - "pattern": [ - "LLL", - "LWL", - "LLL" - ], - "key": { - "L": { - "tag": "forge:glass" - }, - "W": { - "item": "minecraft:dark_oak_planks" - } - }, - "result": { - "item": "create:dark_oak_glass", - "count": 8 - } -} \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/crafting_shaped/palettes/dark_oak_glass_pane.json b/src/main/resources/data/create/recipes/crafting_shaped/palettes/dark_oak_glass_pane.json deleted file mode 100644 index 2a6d87008..000000000 --- a/src/main/resources/data/create/recipes/crafting_shaped/palettes/dark_oak_glass_pane.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "crafting_shaped", - "pattern": [ - "SSS", - "SSS" - ], - "key": { - "S": { - "item": "create:dark_oak_glass" - } - }, - "result": { - "item": "create:dark_oak_glass_pane", - "count": 16 - } -} \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/crafting_shaped/palettes/framed_glass_pane.json b/src/main/resources/data/create/recipes/crafting_shaped/palettes/framed_glass_pane.json deleted file mode 100644 index 5da8b0706..000000000 --- a/src/main/resources/data/create/recipes/crafting_shaped/palettes/framed_glass_pane.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "crafting_shaped", - "pattern": [ - "SSS", - "SSS" - ], - "key": { - "S": { - "item": "create:framed_glass" - } - }, - "result": { - "item": "create:framed_glass_pane", - "count": 16 - } -} \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/crafting_shaped/palettes/horizontal_framed_glass_pane.json b/src/main/resources/data/create/recipes/crafting_shaped/palettes/horizontal_framed_glass_pane.json deleted file mode 100644 index 6159bcee5..000000000 --- a/src/main/resources/data/create/recipes/crafting_shaped/palettes/horizontal_framed_glass_pane.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "crafting_shaped", - "pattern": [ - "SSS", - "SSS" - ], - "key": { - "S": { - "item": "create:horizontal_framed_glass" - } - }, - "result": { - "item": "create:horizontal_framed_glass_pane", - "count": 16 - } -} \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/crafting_shaped/palettes/iron_glass.json b/src/main/resources/data/create/recipes/crafting_shaped/palettes/iron_glass.json deleted file mode 100644 index c7281d485..000000000 --- a/src/main/resources/data/create/recipes/crafting_shaped/palettes/iron_glass.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "crafting_shaped", - "pattern": [ - "LLL", - "LWL", - "LLL" - ], - "key": { - "L": { - "tag": "forge:glass" - }, - "W": { - "item": "create:andesite_alloy" - } - }, - "result": { - "item": "create:iron_glass", - "count": 8 - } -} \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/crafting_shaped/palettes/iron_glass_pane.json b/src/main/resources/data/create/recipes/crafting_shaped/palettes/iron_glass_pane.json deleted file mode 100644 index a56fb8c1c..000000000 --- a/src/main/resources/data/create/recipes/crafting_shaped/palettes/iron_glass_pane.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "crafting_shaped", - "pattern": [ - "SSS", - "SSS" - ], - "key": { - "S": { - "item": "create:iron_glass" - } - }, - "result": { - "item": "create:iron_glass_pane", - "count": 16 - } -} \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/crafting_shaped/palettes/jungle_glass.json b/src/main/resources/data/create/recipes/crafting_shaped/palettes/jungle_glass.json deleted file mode 100644 index bbf1e4328..000000000 --- a/src/main/resources/data/create/recipes/crafting_shaped/palettes/jungle_glass.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "crafting_shaped", - "pattern": [ - "LLL", - "LWL", - "LLL" - ], - "key": { - "L": { - "tag": "forge:glass" - }, - "W": { - "item": "minecraft:jungle_planks" - } - }, - "result": { - "item": "create:jungle_glass", - "count": 8 - } -} \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/crafting_shaped/palettes/jungle_glass_pane.json b/src/main/resources/data/create/recipes/crafting_shaped/palettes/jungle_glass_pane.json deleted file mode 100644 index 1963deda8..000000000 --- a/src/main/resources/data/create/recipes/crafting_shaped/palettes/jungle_glass_pane.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "crafting_shaped", - "pattern": [ - "SSS", - "SSS" - ], - "key": { - "S": { - "item": "create:jungle_glass" - } - }, - "result": { - "item": "create:jungle_glass_pane", - "count": 16 - } -} \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/crafting_shaped/palettes/oak_glass.json b/src/main/resources/data/create/recipes/crafting_shaped/palettes/oak_glass.json deleted file mode 100644 index 5112a1142..000000000 --- a/src/main/resources/data/create/recipes/crafting_shaped/palettes/oak_glass.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "crafting_shaped", - "pattern": [ - "LLL", - "LWL", - "LLL" - ], - "key": { - "L": { - "tag": "forge:glass" - }, - "W": { - "item": "minecraft:oak_planks" - } - }, - "result": { - "item": "create:oak_glass", - "count": 8 - } -} \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/crafting_shaped/palettes/oak_glass_pane.json b/src/main/resources/data/create/recipes/crafting_shaped/palettes/oak_glass_pane.json deleted file mode 100644 index 7e98436ac..000000000 --- a/src/main/resources/data/create/recipes/crafting_shaped/palettes/oak_glass_pane.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "crafting_shaped", - "pattern": [ - "SSS", - "SSS" - ], - "key": { - "S": { - "item": "create:oak_glass" - } - }, - "result": { - "item": "create:oak_glass_pane", - "count": 16 - } -} \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/crafting_shaped/palettes/spruce_glass.json b/src/main/resources/data/create/recipes/crafting_shaped/palettes/spruce_glass.json deleted file mode 100644 index 8fd498d80..000000000 --- a/src/main/resources/data/create/recipes/crafting_shaped/palettes/spruce_glass.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "crafting_shaped", - "pattern": [ - "LLL", - "LWL", - "LLL" - ], - "key": { - "L": { - "tag": "forge:glass" - }, - "W": { - "item": "minecraft:spruce_planks" - } - }, - "result": { - "item": "create:spruce_glass", - "count": 8 - } -} \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/crafting_shaped/palettes/spruce_glass_pane.json b/src/main/resources/data/create/recipes/crafting_shaped/palettes/spruce_glass_pane.json deleted file mode 100644 index 5c6693153..000000000 --- a/src/main/resources/data/create/recipes/crafting_shaped/palettes/spruce_glass_pane.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "crafting_shaped", - "pattern": [ - "SSS", - "SSS" - ], - "key": { - "S": { - "item": "create:spruce_glass" - } - }, - "result": { - "item": "create:spruce_glass_pane", - "count": 16 - } -} \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/crafting_shaped/palettes/tiled_glass_pane.json b/src/main/resources/data/create/recipes/crafting_shaped/palettes/tiled_glass_pane.json deleted file mode 100644 index 0d0b1ded3..000000000 --- a/src/main/resources/data/create/recipes/crafting_shaped/palettes/tiled_glass_pane.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "crafting_shaped", - "pattern": [ - "SSS", - "SSS" - ], - "key": { - "S": { - "item": "create:tiled_glass" - } - }, - "result": { - "item": "create:tiled_glass_pane", - "count": 16 - } -} \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/crafting_shaped/palettes/vertical_framed_glass_pane.json b/src/main/resources/data/create/recipes/crafting_shaped/palettes/vertical_framed_glass_pane.json deleted file mode 100644 index 7180ac0af..000000000 --- a/src/main/resources/data/create/recipes/crafting_shaped/palettes/vertical_framed_glass_pane.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "crafting_shaped", - "pattern": [ - "SSS", - "SSS" - ], - "key": { - "S": { - "item": "create:vertical_framed_glass" - } - }, - "result": { - "item": "create:vertical_framed_glass_pane", - "count": 16 - } -} \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/crafting_shaped/zinc_handle.json b/src/main/resources/data/create/recipes/crafting_shaped/zinc_handle.json deleted file mode 100644 index 0e91a4679..000000000 --- a/src/main/resources/data/create/recipes/crafting_shaped/zinc_handle.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "crafting_shaped", - "pattern": [ - "Z", - "Z" - ], - "key": { - "Z": { - "tag": "forge:ingots/zinc" - } - }, - "result": { - "item": "create:zinc_handle", - "count": 1 - } -} \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/crafting_shapeless/cocoa_log.json b/src/main/resources/data/create/recipes/crafting_shapeless/cocoa_log.json deleted file mode 100644 index 725753091..000000000 --- a/src/main/resources/data/create/recipes/crafting_shapeless/cocoa_log.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "tag": "minecraft:jungle_logs" - }, - { - "item": "minecraft:cocoa_beans" - } - ], - "result": { - "item": "create:cocoa_log", - "count": 1 - } -} \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/mechanical_crafting/rose_quartz_axe.json b/src/main/resources/data/create/recipes/mechanical_crafting/rose_quartz_axe.json deleted file mode 100644 index 34fb3098c..000000000 --- a/src/main/resources/data/create/recipes/mechanical_crafting/rose_quartz_axe.json +++ /dev/null @@ -1,27 +0,0 @@ -{ - "type": "create:mechanical_crafting", - "pattern": [ - " C ", - "RGR", - "RZ ", - " Z " - ], - "key": { - "Z": { - "item": "create:zinc_handle" - }, - "R": { - "item": "create:polished_rose_quartz" - }, - "C": { - "tag": "forge:plates/iron" - }, - "G": { - "tag": "forge:ingots/gold" - } - }, - "result": { - "item": "create:rose_quartz_axe", - "count": 1 - } -} \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/mechanical_crafting/rose_quartz_pickaxe.json b/src/main/resources/data/create/recipes/mechanical_crafting/rose_quartz_pickaxe.json deleted file mode 100644 index 3d84a2bbb..000000000 --- a/src/main/resources/data/create/recipes/mechanical_crafting/rose_quartz_pickaxe.json +++ /dev/null @@ -1,27 +0,0 @@ -{ - "type": "create:mechanical_crafting", - "pattern": [ - " C ", - "RGR", - "RZR", - " Z " - ], - "key": { - "Z": { - "item": "create:zinc_handle" - }, - "R": { - "item": "create:polished_rose_quartz" - }, - "C": { - "tag": "forge:plates/iron" - }, - "G": { - "tag": "forge:ingots/gold" - } - }, - "result": { - "item": "create:rose_quartz_pickaxe", - "count": 1 - } -} \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/mechanical_crafting/rose_quartz_shovel.json b/src/main/resources/data/create/recipes/mechanical_crafting/rose_quartz_shovel.json deleted file mode 100644 index 1ff8aadf3..000000000 --- a/src/main/resources/data/create/recipes/mechanical_crafting/rose_quartz_shovel.json +++ /dev/null @@ -1,27 +0,0 @@ -{ - "type": "create:mechanical_crafting", - "pattern": [ - " R ", - "CGC", - " Z ", - " Z " - ], - "key": { - "Z": { - "item": "create:zinc_handle" - }, - "R": { - "item": "create:polished_rose_quartz" - }, - "C": { - "tag": "forge:plates/iron" - }, - "G": { - "tag": "forge:ingots/gold" - } - }, - "result": { - "item": "create:rose_quartz_shovel", - "count": 1 - } -} \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/mechanical_crafting/rose_quartz_sword.json b/src/main/resources/data/create/recipes/mechanical_crafting/rose_quartz_sword.json deleted file mode 100644 index c8403b1da..000000000 --- a/src/main/resources/data/create/recipes/mechanical_crafting/rose_quartz_sword.json +++ /dev/null @@ -1,27 +0,0 @@ -{ - "type": "create:mechanical_crafting", - "pattern": [ - " R ", - " R ", - "CGC", - " Z " - ], - "key": { - "Z": { - "item": "create:zinc_handle" - }, - "R": { - "item": "create:polished_rose_quartz" - }, - "C": { - "tag": "forge:plates/iron" - }, - "G": { - "tag": "forge:ingots/gold" - } - }, - "result": { - "item": "create:rose_quartz_sword", - "count": 1 - } -} \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/mixing/blazing_axe.json b/src/main/resources/data/create/recipes/mixing/blazing_axe.json deleted file mode 100644 index c5bbc965e..000000000 --- a/src/main/resources/data/create/recipes/mixing/blazing_axe.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "create:mixing", - "ingredients": [ - { - "item": "minecraft:golden_axe" - }, - { - "item": "create:obsidian_dust" - }, - { - "item": "minecraft:blaze_powder", - "count": 4 - } - ], - "results": [ - { - "item": "create:blazing_axe", - "count": 1 - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/mixing/blazing_pickaxe.json b/src/main/resources/data/create/recipes/mixing/blazing_pickaxe.json deleted file mode 100644 index 1f8c33066..000000000 --- a/src/main/resources/data/create/recipes/mixing/blazing_pickaxe.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "create:mixing", - "ingredients": [ - { - "item": "minecraft:golden_pickaxe" - }, - { - "item": "create:obsidian_dust" - }, - { - "item": "minecraft:blaze_powder", - "count": 4 - } - ], - "results": [ - { - "item": "create:blazing_pickaxe", - "count": 1 - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/mixing/blazing_shovel.json b/src/main/resources/data/create/recipes/mixing/blazing_shovel.json deleted file mode 100644 index a65673c19..000000000 --- a/src/main/resources/data/create/recipes/mixing/blazing_shovel.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "create:mixing", - "ingredients": [ - { - "item": "minecraft:golden_shovel" - }, - { - "item": "create:obsidian_dust" - }, - { - "item": "minecraft:blaze_powder", - "count": 4 - } - ], - "results": [ - { - "item": "create:blazing_shovel", - "count": 1 - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/mixing/blazing_sword.json b/src/main/resources/data/create/recipes/mixing/blazing_sword.json deleted file mode 100644 index 99f9051d9..000000000 --- a/src/main/resources/data/create/recipes/mixing/blazing_sword.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "create:mixing", - "ingredients": [ - { - "item": "minecraft:golden_sword" - }, - { - "item": "create:obsidian_dust" - }, - { - "item": "minecraft:blaze_powder", - "count": 4 - } - ], - "results": [ - { - "item": "create:blazing_sword", - "count": 1 - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/stonecutting/framed_glass.json b/src/main/resources/data/create/recipes/stonecutting/framed_glass.json deleted file mode 100644 index 71a180a11..000000000 --- a/src/main/resources/data/create/recipes/stonecutting/framed_glass.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "type": "minecraft:stonecutting", - "ingredient": { - "item": "minecraft:glass" - }, - "result": "create:framed_glass", - "count": 1 -} \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/stonecutting/framed_glass_pane.json b/src/main/resources/data/create/recipes/stonecutting/framed_glass_pane.json deleted file mode 100644 index fff6f66a5..000000000 --- a/src/main/resources/data/create/recipes/stonecutting/framed_glass_pane.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "type": "minecraft:stonecutting", - "ingredient": { - "item": "minecraft:glass_pane" - }, - "result": "create:framed_glass_pane", - "count": 1 -} \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/stonecutting/tiled_glass.json b/src/main/resources/data/create/recipes/stonecutting/tiled_glass.json deleted file mode 100644 index 66d927acb..000000000 --- a/src/main/resources/data/create/recipes/stonecutting/tiled_glass.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "type": "minecraft:stonecutting", - "ingredient": { - "item": "minecraft:glass" - }, - "result": "create:tiled_glass", - "count": 1 -} \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/stonecutting/tiled_glass_pane.json b/src/main/resources/data/create/recipes/stonecutting/tiled_glass_pane.json deleted file mode 100644 index 0afb55abf..000000000 --- a/src/main/resources/data/create/recipes/stonecutting/tiled_glass_pane.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "type": "minecraft:stonecutting", - "ingredient": { - "item": "minecraft:glass_pane" - }, - "result": "create:tiled_glass_pane", - "count": 1 -} \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/stonecutting/vertical_framed_glass.json b/src/main/resources/data/create/recipes/stonecutting/vertical_framed_glass.json deleted file mode 100644 index 0cfca3a5a..000000000 --- a/src/main/resources/data/create/recipes/stonecutting/vertical_framed_glass.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "type": "minecraft:stonecutting", - "ingredient": { - "item": "minecraft:glass" - }, - "result": "create:vertical_framed_glass", - "count": 1 -} \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/stonecutting/vertical_framed_glass_pane.json b/src/main/resources/data/create/recipes/stonecutting/vertical_framed_glass_pane.json deleted file mode 100644 index ffbc1fdb2..000000000 --- a/src/main/resources/data/create/recipes/stonecutting/vertical_framed_glass_pane.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "type": "minecraft:stonecutting", - "ingredient": { - "item": "minecraft:glass_pane" - }, - "result": "create:vertical_framed_glass_pane", - "count": 1 -} \ No newline at end of file