diff --git a/kfc/gradle.properties b/kfc/gradle.properties index f2085238..67786025 100644 --- a/kfc/gradle.properties +++ b/kfc/gradle.properties @@ -7,7 +7,7 @@ mod_group=nmd.primal.forgecraft mod_name=ForgeCraft mod_version=1.6.25 -forge_version=14.23.4.2744 +forge_version=14.23.4.2765 mcp_mappings=snapshot_20171003 mc_version=1.12.2 diff --git a/kfc/src/main/java/nmd/primal/forgecraft/blocks/anvil/AnvilBase.java b/kfc/src/main/java/nmd/primal/forgecraft/blocks/AnvilBase.java similarity index 98% rename from kfc/src/main/java/nmd/primal/forgecraft/blocks/anvil/AnvilBase.java rename to kfc/src/main/java/nmd/primal/forgecraft/blocks/AnvilBase.java index 13ed8157..490c4c8e 100644 --- a/kfc/src/main/java/nmd/primal/forgecraft/blocks/anvil/AnvilBase.java +++ b/kfc/src/main/java/nmd/primal/forgecraft/blocks/AnvilBase.java @@ -1,4 +1,4 @@ -package nmd.primal.forgecraft.blocks.anvil; +package nmd.primal.forgecraft.blocks; import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; diff --git a/kfc/src/main/java/nmd/primal/forgecraft/blocks/anvil/AnvilIron.java b/kfc/src/main/java/nmd/primal/forgecraft/blocks/AnvilIron.java similarity index 98% rename from kfc/src/main/java/nmd/primal/forgecraft/blocks/anvil/AnvilIron.java rename to kfc/src/main/java/nmd/primal/forgecraft/blocks/AnvilIron.java index 99ac8e68..d890d370 100644 --- a/kfc/src/main/java/nmd/primal/forgecraft/blocks/anvil/AnvilIron.java +++ b/kfc/src/main/java/nmd/primal/forgecraft/blocks/AnvilIron.java @@ -1,4 +1,4 @@ -package nmd.primal.forgecraft.blocks.anvil; +package nmd.primal.forgecraft.blocks; import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; diff --git a/kfc/src/main/java/nmd/primal/forgecraft/blocks/anvil/AnvilSteel.java b/kfc/src/main/java/nmd/primal/forgecraft/blocks/AnvilSteel.java similarity index 61% rename from kfc/src/main/java/nmd/primal/forgecraft/blocks/anvil/AnvilSteel.java rename to kfc/src/main/java/nmd/primal/forgecraft/blocks/AnvilSteel.java index a52c2306..c820430d 100644 --- a/kfc/src/main/java/nmd/primal/forgecraft/blocks/anvil/AnvilSteel.java +++ b/kfc/src/main/java/nmd/primal/forgecraft/blocks/AnvilSteel.java @@ -1,4 +1,4 @@ -package nmd.primal.forgecraft.blocks.anvil; +package nmd.primal.forgecraft.blocks; /** * Created by mminaie on 6/10/17. diff --git a/kfc/src/main/java/nmd/primal/forgecraft/blocks/anvil/AnvilStone.java b/kfc/src/main/java/nmd/primal/forgecraft/blocks/AnvilStone.java similarity index 99% rename from kfc/src/main/java/nmd/primal/forgecraft/blocks/anvil/AnvilStone.java rename to kfc/src/main/java/nmd/primal/forgecraft/blocks/AnvilStone.java index 179ee6af..474ae00a 100644 --- a/kfc/src/main/java/nmd/primal/forgecraft/blocks/anvil/AnvilStone.java +++ b/kfc/src/main/java/nmd/primal/forgecraft/blocks/AnvilStone.java @@ -1,4 +1,4 @@ -package nmd.primal.forgecraft.blocks.anvil; +package nmd.primal.forgecraft.blocks; import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; 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 044954d7..ee8a992d 100644 --- a/kfc/src/main/java/nmd/primal/forgecraft/init/ModBlocks.java +++ b/kfc/src/main/java/nmd/primal/forgecraft/init/ModBlocks.java @@ -13,7 +13,7 @@ import net.minecraftforge.fml.relauncher.SideOnly; import nmd.primal.core.api.PrimalAPI; import nmd.primal.forgecraft.blocks.Chisel; import nmd.primal.forgecraft.blocks.YewStave; -import nmd.primal.forgecraft.blocks.anvil.AnvilStone; +import nmd.primal.forgecraft.blocks.AnvilStone; import nmd.primal.forgecraft.blocks.NBTCrucible; 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 ee0646ea..60ba1070 100644 --- a/kfc/src/main/java/nmd/primal/forgecraft/items/SlottedTongs.java +++ b/kfc/src/main/java/nmd/primal/forgecraft/items/SlottedTongs.java @@ -32,7 +32,7 @@ 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.anvil.AnvilBase; +import nmd.primal.forgecraft.blocks.AnvilBase; import nmd.primal.forgecraft.blocks.NBTCrucible; import nmd.primal.forgecraft.blocks.machine.Forge; import nmd.primal.forgecraft.init.ModItems; 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 9c2717b7..3da0f22b 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.anvil.AnvilBase; -import nmd.primal.forgecraft.blocks.anvil.AnvilStone; +import nmd.primal.forgecraft.blocks.AnvilBase; +import nmd.primal.forgecraft.blocks.AnvilStone; import nmd.primal.forgecraft.init.ModItems; import nmd.primal.forgecraft.items.BaseMultiItem; import nmd.primal.forgecraft.tiles.TileAnvil;