From 5a203384d8acd2f018b0620a69a7dfcd15138425 Mon Sep 17 00:00:00 2001 From: Mohammad-Ali Minaie Date: Fri, 2 Nov 2018 21:40:33 -0400 Subject: [PATCH] animationStateManager update refactor some packages --- kfc/To-Dos.md | 9 +++++---- .../primal/forgecraft/blocks/{ => anvil}/AnvilBase.java | 3 ++- .../primal/forgecraft/blocks/{ => anvil}/AnvilIron.java | 2 +- .../primal/forgecraft/blocks/{ => anvil}/AnvilSteel.java | 2 +- .../primal/forgecraft/blocks/{ => anvil}/AnvilStone.java | 2 +- .../nmd/primal/forgecraft/blocks/{ => misc}/Chisel.java | 4 ++-- .../primal/forgecraft/blocks/{ => misc}/NBTCrucible.java | 2 +- .../primal/forgecraft/blocks/{ => misc}/YewStave.java | 3 ++- .../main/java/nmd/primal/forgecraft/init/ModBlocks.java | 8 ++++---- .../java/nmd/primal/forgecraft/items/SlottedTongs.java | 4 ++-- .../forgecraft/renders/blocks/TileAnvilRender.java | 4 ++-- .../java/nmd/primal/forgecraft/tiles/TileBloomery.java | 2 +- .../forgecraft/asms/block/{pump.json => testpump.json} | 0 13 files changed, 24 insertions(+), 21 deletions(-) rename kfc/src/main/java/nmd/primal/forgecraft/blocks/{ => anvil}/AnvilBase.java (95%) rename kfc/src/main/java/nmd/primal/forgecraft/blocks/{ => anvil}/AnvilIron.java (98%) rename kfc/src/main/java/nmd/primal/forgecraft/blocks/{ => anvil}/AnvilSteel.java (61%) rename kfc/src/main/java/nmd/primal/forgecraft/blocks/{ => anvil}/AnvilStone.java (99%) rename kfc/src/main/java/nmd/primal/forgecraft/blocks/{ => misc}/Chisel.java (99%) rename kfc/src/main/java/nmd/primal/forgecraft/blocks/{ => misc}/NBTCrucible.java (99%) rename kfc/src/main/java/nmd/primal/forgecraft/blocks/{ => misc}/YewStave.java (96%) rename kfc/src/main/resources/assets/forgecraft/asms/block/{pump.json => testpump.json} (100%) diff --git a/kfc/To-Dos.md b/kfc/To-Dos.md index c8b970dd..ac91efbe 100644 --- a/kfc/To-Dos.md +++ b/kfc/To-Dos.md @@ -4,15 +4,16 @@ - [ ] Placement bug for crucible from tongs - [ ] Wootz shovel not rendering (NORTH) -- [ ] Damascus Rendering in tongs - +- [ ] Cool Damascus Rendering in tongs ## Current Feature -- [ ] Damascus Workblade Recipe +- [ ] ASM models + +## Feature Optimizations - [ ] Untick Bloomery and Forge - [ ] Craft Tweaker Support - [ ] Recipe Handler for Block Breaker -- [ ] Mass Ore Production +- [ ] Damascus Workblade Recipe ## Feature Musket - [ ] Create powder charge item (copper, charcoal, gunpowder) diff --git a/kfc/src/main/java/nmd/primal/forgecraft/blocks/AnvilBase.java b/kfc/src/main/java/nmd/primal/forgecraft/blocks/anvil/AnvilBase.java similarity index 95% rename from kfc/src/main/java/nmd/primal/forgecraft/blocks/AnvilBase.java rename to kfc/src/main/java/nmd/primal/forgecraft/blocks/anvil/AnvilBase.java index 23acab62..13ed8157 100644 --- a/kfc/src/main/java/nmd/primal/forgecraft/blocks/AnvilBase.java +++ b/kfc/src/main/java/nmd/primal/forgecraft/blocks/anvil/AnvilBase.java @@ -1,4 +1,4 @@ -package nmd.primal.forgecraft.blocks; +package nmd.primal.forgecraft.blocks.anvil; import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; @@ -8,6 +8,7 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumFacing; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; +import nmd.primal.forgecraft.blocks.CustomContainerFacing; import nmd.primal.forgecraft.tiles.TileAnvil; import nmd.primal.forgecraft.util.AnvilHandler; diff --git a/kfc/src/main/java/nmd/primal/forgecraft/blocks/AnvilIron.java b/kfc/src/main/java/nmd/primal/forgecraft/blocks/anvil/AnvilIron.java similarity index 98% rename from kfc/src/main/java/nmd/primal/forgecraft/blocks/AnvilIron.java rename to kfc/src/main/java/nmd/primal/forgecraft/blocks/anvil/AnvilIron.java index d890d370..99ac8e68 100644 --- a/kfc/src/main/java/nmd/primal/forgecraft/blocks/AnvilIron.java +++ b/kfc/src/main/java/nmd/primal/forgecraft/blocks/anvil/AnvilIron.java @@ -1,4 +1,4 @@ -package nmd.primal.forgecraft.blocks; +package nmd.primal.forgecraft.blocks.anvil; import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; diff --git a/kfc/src/main/java/nmd/primal/forgecraft/blocks/AnvilSteel.java b/kfc/src/main/java/nmd/primal/forgecraft/blocks/anvil/AnvilSteel.java similarity index 61% rename from kfc/src/main/java/nmd/primal/forgecraft/blocks/AnvilSteel.java rename to kfc/src/main/java/nmd/primal/forgecraft/blocks/anvil/AnvilSteel.java index c820430d..a52c2306 100644 --- a/kfc/src/main/java/nmd/primal/forgecraft/blocks/AnvilSteel.java +++ b/kfc/src/main/java/nmd/primal/forgecraft/blocks/anvil/AnvilSteel.java @@ -1,4 +1,4 @@ -package nmd.primal.forgecraft.blocks; +package nmd.primal.forgecraft.blocks.anvil; /** * Created by mminaie on 6/10/17. diff --git a/kfc/src/main/java/nmd/primal/forgecraft/blocks/AnvilStone.java b/kfc/src/main/java/nmd/primal/forgecraft/blocks/anvil/AnvilStone.java similarity index 99% rename from kfc/src/main/java/nmd/primal/forgecraft/blocks/AnvilStone.java rename to kfc/src/main/java/nmd/primal/forgecraft/blocks/anvil/AnvilStone.java index 474ae00a..179ee6af 100644 --- a/kfc/src/main/java/nmd/primal/forgecraft/blocks/AnvilStone.java +++ b/kfc/src/main/java/nmd/primal/forgecraft/blocks/anvil/AnvilStone.java @@ -1,4 +1,4 @@ -package nmd.primal.forgecraft.blocks; +package nmd.primal.forgecraft.blocks.anvil; import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; diff --git a/kfc/src/main/java/nmd/primal/forgecraft/blocks/Chisel.java b/kfc/src/main/java/nmd/primal/forgecraft/blocks/misc/Chisel.java similarity index 99% rename from kfc/src/main/java/nmd/primal/forgecraft/blocks/Chisel.java rename to kfc/src/main/java/nmd/primal/forgecraft/blocks/misc/Chisel.java index c3d9ad67..0971b1e9 100644 --- a/kfc/src/main/java/nmd/primal/forgecraft/blocks/Chisel.java +++ b/kfc/src/main/java/nmd/primal/forgecraft/blocks/misc/Chisel.java @@ -1,4 +1,4 @@ -package nmd.primal.forgecraft.blocks; +package nmd.primal.forgecraft.blocks.misc; import net.minecraft.block.material.Material; import net.minecraft.block.properties.IProperty; @@ -8,7 +8,6 @@ import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; import net.minecraft.init.MobEffects; -import net.minecraft.inventory.ItemStackHelper; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.potion.PotionEffect; @@ -26,6 +25,7 @@ import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import nmd.primal.core.api.PrimalAPI; import nmd.primal.core.common.helper.PlayerHelper; +import nmd.primal.forgecraft.blocks.CustomFacing; import nmd.primal.forgecraft.init.ModSounds; import nmd.primal.forgecraft.items.SledgeHammer; import nmd.primal.forgecraft.util.ToolMaterialMap; diff --git a/kfc/src/main/java/nmd/primal/forgecraft/blocks/NBTCrucible.java b/kfc/src/main/java/nmd/primal/forgecraft/blocks/misc/NBTCrucible.java similarity index 99% rename from kfc/src/main/java/nmd/primal/forgecraft/blocks/NBTCrucible.java rename to kfc/src/main/java/nmd/primal/forgecraft/blocks/misc/NBTCrucible.java index deb694b9..273a339a 100644 --- a/kfc/src/main/java/nmd/primal/forgecraft/blocks/NBTCrucible.java +++ b/kfc/src/main/java/nmd/primal/forgecraft/blocks/misc/NBTCrucible.java @@ -1,4 +1,4 @@ -package nmd.primal.forgecraft.blocks; +package nmd.primal.forgecraft.blocks.misc; import net.minecraft.block.BlockContainer; import net.minecraft.block.ITileEntityProvider; diff --git a/kfc/src/main/java/nmd/primal/forgecraft/blocks/YewStave.java b/kfc/src/main/java/nmd/primal/forgecraft/blocks/misc/YewStave.java similarity index 96% rename from kfc/src/main/java/nmd/primal/forgecraft/blocks/YewStave.java rename to kfc/src/main/java/nmd/primal/forgecraft/blocks/misc/YewStave.java index b7477e76..1a162acf 100644 --- a/kfc/src/main/java/nmd/primal/forgecraft/blocks/YewStave.java +++ b/kfc/src/main/java/nmd/primal/forgecraft/blocks/misc/YewStave.java @@ -1,4 +1,4 @@ -package nmd.primal.forgecraft.blocks; +package nmd.primal.forgecraft.blocks.misc; import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; @@ -15,6 +15,7 @@ import net.minecraft.world.World; import nmd.primal.core.api.PrimalAPI; import nmd.primal.core.common.helper.PlayerHelper; import nmd.primal.core.common.items.tools.WorkBlade; +import nmd.primal.forgecraft.blocks.BlockCustomBase; import nmd.primal.forgecraft.init.ModItems; import static nmd.primal.core.api.PrimalAPI.randomCheck; diff --git a/kfc/src/main/java/nmd/primal/forgecraft/init/ModBlocks.java b/kfc/src/main/java/nmd/primal/forgecraft/init/ModBlocks.java index 98195b53..99f15231 100644 --- a/kfc/src/main/java/nmd/primal/forgecraft/init/ModBlocks.java +++ b/kfc/src/main/java/nmd/primal/forgecraft/init/ModBlocks.java @@ -11,10 +11,10 @@ import net.minecraftforge.fml.common.registry.ForgeRegistries; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import nmd.primal.core.api.PrimalAPI; -import nmd.primal.forgecraft.blocks.AnvilStone; -import nmd.primal.forgecraft.blocks.Chisel; -import nmd.primal.forgecraft.blocks.NBTCrucible; -import nmd.primal.forgecraft.blocks.YewStave; +import nmd.primal.forgecraft.blocks.anvil.AnvilStone; +import nmd.primal.forgecraft.blocks.misc.Chisel; +import nmd.primal.forgecraft.blocks.misc.NBTCrucible; +import nmd.primal.forgecraft.blocks.misc.YewStave; import nmd.primal.forgecraft.blocks.machine.*; /** diff --git a/kfc/src/main/java/nmd/primal/forgecraft/items/SlottedTongs.java b/kfc/src/main/java/nmd/primal/forgecraft/items/SlottedTongs.java index 60ba1070..666b10e2 100644 --- a/kfc/src/main/java/nmd/primal/forgecraft/items/SlottedTongs.java +++ b/kfc/src/main/java/nmd/primal/forgecraft/items/SlottedTongs.java @@ -32,8 +32,8 @@ import nmd.primal.core.common.helper.PlayerHelper; import nmd.primal.core.common.helper.RecipeHelper; import nmd.primal.core.common.tiles.AbstractTileTank; import nmd.primal.forgecraft.ModInfo; -import nmd.primal.forgecraft.blocks.AnvilBase; -import nmd.primal.forgecraft.blocks.NBTCrucible; +import nmd.primal.forgecraft.blocks.anvil.AnvilBase; +import nmd.primal.forgecraft.blocks.misc.NBTCrucible; import nmd.primal.forgecraft.blocks.machine.Forge; import nmd.primal.forgecraft.init.ModItems; import nmd.primal.forgecraft.items.blocks.ItemNBTCrucible; diff --git a/kfc/src/main/java/nmd/primal/forgecraft/renders/blocks/TileAnvilRender.java b/kfc/src/main/java/nmd/primal/forgecraft/renders/blocks/TileAnvilRender.java index 9a45ec50..fc0385b0 100644 --- a/kfc/src/main/java/nmd/primal/forgecraft/renders/blocks/TileAnvilRender.java +++ b/kfc/src/main/java/nmd/primal/forgecraft/renders/blocks/TileAnvilRender.java @@ -13,8 +13,8 @@ import net.minecraft.item.Item; import net.minecraft.util.EnumFacing; import net.minecraft.util.math.BlockPos; import nmd.primal.core.api.PrimalAPI; -import nmd.primal.forgecraft.blocks.AnvilBase; -import nmd.primal.forgecraft.blocks.AnvilStone; +import nmd.primal.forgecraft.blocks.anvil.AnvilBase; +import nmd.primal.forgecraft.blocks.anvil.AnvilStone; import nmd.primal.forgecraft.init.ModItems; import nmd.primal.forgecraft.items.BaseMultiItem; import nmd.primal.forgecraft.tiles.TileAnvil; diff --git a/kfc/src/main/java/nmd/primal/forgecraft/tiles/TileBloomery.java b/kfc/src/main/java/nmd/primal/forgecraft/tiles/TileBloomery.java index 6873ddcc..5eec497f 100644 --- a/kfc/src/main/java/nmd/primal/forgecraft/tiles/TileBloomery.java +++ b/kfc/src/main/java/nmd/primal/forgecraft/tiles/TileBloomery.java @@ -14,7 +14,7 @@ import net.minecraft.world.World; import nmd.primal.core.api.PrimalAPI; import nmd.primal.core.common.helper.FireHelper; import nmd.primal.core.common.helper.RecipeHelper; -import nmd.primal.forgecraft.blocks.NBTCrucible; +import nmd.primal.forgecraft.blocks.misc.NBTCrucible; import nmd.primal.forgecraft.blocks.machine.BloomeryBase; import nmd.primal.forgecraft.crafting.CrucibleCrafting; import nmd.primal.forgecraft.init.ModItems; diff --git a/kfc/src/main/resources/assets/forgecraft/asms/block/pump.json b/kfc/src/main/resources/assets/forgecraft/asms/block/testpump.json similarity index 100% rename from kfc/src/main/resources/assets/forgecraft/asms/block/pump.json rename to kfc/src/main/resources/assets/forgecraft/asms/block/testpump.json