From e86fa3f51821a1ea3af2ff14a7e1cffbb13a0522 Mon Sep 17 00:00:00 2001 From: Mohammad-Ali Minaie Date: Sun, 25 Jun 2017 22:25:54 -0400 Subject: [PATCH] master commit --- 1.11/gradle.properties | 2 +- .../java/nmd/primal/forgecraft/ModInfo.java | 2 +- .../forgecraft/blocks/BloomeryBase.java | 13 +- .../forgecraft/blocks/CastingBlock.java | 28 +- .../primal/forgecraft/blocks/CastingForm.java | 3 - .../primal/forgecraft/blocks/IngotBall.java | 1 - .../forgecraft/blocks/PistonBellows.java | 2 - .../nmd/primal/forgecraft/init/ModBlocks.java | 2 +- .../primal/forgecraft/init/ModCrafting.java | 73 +++- .../nmd/primal/forgecraft/init/ModEvents.java | 2 - .../nmd/primal/forgecraft/init/ModItems.java | 53 ++- .../forgecraft/items/ItemForgingManual.java | 1 - .../forgecraft/items/ItemSoftCrucible.java | 2 - .../forgecraft/items/ItemStoneTongs.java | 4 +- .../forgecraft/items/weapons/CustomSword.java | 4 +- .../forgecraft/items/weapons/SlayerSword.java | 76 ++++ .../blocks/TileCastingBlockRender.java | 3 - .../renders/blocks/TileCastingformRender.java | 9 - .../forgecraft/tiles/TileCastingBlock.java | 3 - .../forgecraft/tiles/TilePistonBellows.java | 2 - .../forgecraft/util/BreakerHandler.java | 25 +- .../assets/forgecraft/lang/en_us.lang | 11 + .../models/item/cleanirongladius.json | 293 ++++++++++++++++ .../models/item/cleanironlongsword.json | 10 + .../models/item/cleanironslayer.json | 10 + .../forgecraft/models/item/e_particle.png | Bin 0 -> 159 bytes .../forgecraft/models/item/e_texture.png | Bin 0 -> 141 bytes .../forgecraft/models/item/longsword.json | 268 ++++++++++++++ .../assets/forgecraft/models/item/slayer.json | 331 ++++++++++++++++++ .../forgecraft/models/item/slayer2.json | 331 ++++++++++++++++++ .../{ironsword2.json => steelgladius.json} | 6 +- .../models/item/steellongsword.json | 10 + .../forgecraft/models/item/steelslayer.json | 10 + .../models/item/wroughtironslayer.json | 10 + .../textures/blocks/clean_iron_ingot_dark.png | Bin 0 -> 494 bytes .../blocks/clean_iron_ingot_light.png | Bin 0 -> 602 bytes .../textures/blocks/iron_ingot_dark.png | Bin 0 -> 464 bytes .../textures/blocks/iron_ingot_light.png | Bin 0 -> 458 bytes .../textures/blocks/steel_ingot_dark.png | Bin 0 -> 562 bytes .../textures/blocks/steel_ingot_light.png | Bin 0 -> 584 bytes 1.11/src/main/resources/mcmod.info | 2 +- 41 files changed, 1529 insertions(+), 73 deletions(-) create mode 100644 1.11/src/main/java/nmd/primal/forgecraft/items/weapons/SlayerSword.java create mode 100644 1.11/src/main/resources/assets/forgecraft/models/item/cleanirongladius.json create mode 100644 1.11/src/main/resources/assets/forgecraft/models/item/cleanironlongsword.json create mode 100644 1.11/src/main/resources/assets/forgecraft/models/item/cleanironslayer.json create mode 100644 1.11/src/main/resources/assets/forgecraft/models/item/e_particle.png create mode 100644 1.11/src/main/resources/assets/forgecraft/models/item/e_texture.png create mode 100644 1.11/src/main/resources/assets/forgecraft/models/item/longsword.json create mode 100644 1.11/src/main/resources/assets/forgecraft/models/item/slayer.json create mode 100644 1.11/src/main/resources/assets/forgecraft/models/item/slayer2.json rename 1.11/src/main/resources/assets/forgecraft/models/item/{ironsword2.json => steelgladius.json} (98%) create mode 100644 1.11/src/main/resources/assets/forgecraft/models/item/steellongsword.json create mode 100644 1.11/src/main/resources/assets/forgecraft/models/item/steelslayer.json create mode 100644 1.11/src/main/resources/assets/forgecraft/models/item/wroughtironslayer.json create mode 100644 1.11/src/main/resources/assets/forgecraft/textures/blocks/clean_iron_ingot_dark.png create mode 100644 1.11/src/main/resources/assets/forgecraft/textures/blocks/clean_iron_ingot_light.png create mode 100644 1.11/src/main/resources/assets/forgecraft/textures/blocks/iron_ingot_dark.png create mode 100644 1.11/src/main/resources/assets/forgecraft/textures/blocks/iron_ingot_light.png create mode 100644 1.11/src/main/resources/assets/forgecraft/textures/blocks/steel_ingot_dark.png create mode 100644 1.11/src/main/resources/assets/forgecraft/textures/blocks/steel_ingot_light.png diff --git a/1.11/gradle.properties b/1.11/gradle.properties index ad5d81e2..219e9e98 100644 --- a/1.11/gradle.properties +++ b/1.11/gradle.properties @@ -5,7 +5,7 @@ org.gradle.jvmargs=-Xmx3G mod_group=nmd.primal.forgecraft mod_name=ForgeCraft -mod_version=1.2.41 +mod_version=1.2.51 forge_version=13.20.0.2315 mcp_mappings=snapshot_20170121 mc_version=1.11.2 diff --git a/1.11/src/main/java/nmd/primal/forgecraft/ModInfo.java b/1.11/src/main/java/nmd/primal/forgecraft/ModInfo.java index c59851d4..161be58d 100644 --- a/1.11/src/main/java/nmd/primal/forgecraft/ModInfo.java +++ b/1.11/src/main/java/nmd/primal/forgecraft/ModInfo.java @@ -17,7 +17,7 @@ public class ModInfo { public static final String MOD_CONFIG = "primal/" + MOD_ID; //public static final String MOD_PREFIX = MOD_ID + ":"; public static final String MOD_CHANNEL = MOD_ID; - public static final String MOD_VERSION = "1.2.41"; + public static final String MOD_VERSION = "1.2.51"; public static final String MC_VERSIONS = "[1.11.0, 1.12.0)"; public static final String DEPENDENCIES = "required-after:forge@[13.20.0.2315,);" + "required-after:primal@[0.4,);"; diff --git a/1.11/src/main/java/nmd/primal/forgecraft/blocks/BloomeryBase.java b/1.11/src/main/java/nmd/primal/forgecraft/blocks/BloomeryBase.java index c3ef7f97..def58c2f 100644 --- a/1.11/src/main/java/nmd/primal/forgecraft/blocks/BloomeryBase.java +++ b/1.11/src/main/java/nmd/primal/forgecraft/blocks/BloomeryBase.java @@ -15,8 +15,6 @@ import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.*; import net.minecraft.util.math.BlockPos; -import net.minecraft.util.math.RayTraceResult; -import net.minecraft.util.math.Vec3d; import net.minecraft.util.text.ITextComponent; import net.minecraft.util.text.TextComponentString; import net.minecraft.world.IBlockAccess; @@ -25,7 +23,6 @@ import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import nmd.primal.core.api.PrimalStates; import nmd.primal.core.common.crafting.FireSource; -import nmd.primal.core.common.helper.FireHelper; import nmd.primal.core.common.helper.PlayerHelper; import nmd.primal.forgecraft.ModInfo; import nmd.primal.forgecraft.crafting.BloomeryCrafting; @@ -109,12 +106,12 @@ public class BloomeryBase extends CustomContainerFacing implements ITileEntityPr } String display = - "Current Temp: " + stringBloomeryHeat + '\n' - + "Ideal Temp: " + stringIdealTemp + '\n' - + "Ticks Remaining: " + stringRemainingTime + '\n' - + "Fuel Remaining: " + tile.getSlotStack(0).getCount() + '\n'; + "Current Temp: " + stringBloomeryHeat + + "Ideal Temp: " + stringIdealTemp + + "Ticks Remaining: " + stringRemainingTime + + "Fuel Remaining: " + tile.getSlotStack(0).getCount(); ITextComponent itextcomponent = new TextComponentString(display); - player.sendStatusMessage(itextcomponent, false); + player.sendStatusMessage(itextcomponent, true); return true; } } diff --git a/1.11/src/main/java/nmd/primal/forgecraft/blocks/CastingBlock.java b/1.11/src/main/java/nmd/primal/forgecraft/blocks/CastingBlock.java index 010b8f92..b056c215 100644 --- a/1.11/src/main/java/nmd/primal/forgecraft/blocks/CastingBlock.java +++ b/1.11/src/main/java/nmd/primal/forgecraft/blocks/CastingBlock.java @@ -13,6 +13,7 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumBlockRenderType; import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumHand; +import net.minecraft.util.EnumParticleTypes; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; @@ -25,9 +26,9 @@ import nmd.primal.forgecraft.ModInfo; import nmd.primal.forgecraft.init.ModItems; import nmd.primal.forgecraft.items.casting.CastingPart; import nmd.primal.forgecraft.tiles.TileCastingBlock; -import nmd.primal.forgecraft.tiles.TileCastingForm; import java.util.Random; +import java.util.concurrent.ThreadLocalRandom; /** * Created by mminaie on 6/24/17. @@ -41,7 +42,31 @@ public class CastingBlock extends CustomContainerFacing { setDefaultState(this.blockState.getBaseState().withProperty(FACING, EnumFacing.NORTH)); setCreativeTab(ModInfo.TAB_FORGECRAFT); } + private void makeEmbers(World world, BlockPos pos, Random rand){ + double d0 = (double)pos.getX() + 0.5D; + double d1 = (double)pos.getY() + 0.2D; + double d2 = (double)pos.getZ() + 0.5D; + double d3 = 0.52D; + double d4 = ThreadLocalRandom.current().nextDouble(0.066, 0.33); + double ySpeed = ThreadLocalRandom.current().nextDouble(0.05, 0.20); + if(rand.nextInt(3) == 0){ + world.spawnParticle(EnumParticleTypes.FLAME, d0+d4, d1, d2+d4, ySpeed, ySpeed, ySpeed, new int[0]); + world.spawnParticle(EnumParticleTypes.FLAME, d0+d4, d1, d2-d4, ySpeed, ySpeed, ySpeed, new int[0]); + } + if(rand.nextInt(3) == 1){ + world.spawnParticle(EnumParticleTypes.FLAME, d0+d4, d1, d2-d4, ySpeed, ySpeed, ySpeed, new int[0]); + world.spawnParticle(EnumParticleTypes.FLAME, d0-d4, d1, d2+d4, ySpeed, ySpeed, ySpeed, new int[0]); + } + if(rand.nextInt(3) == 2){ + world.spawnParticle(EnumParticleTypes.FLAME, d0-d4, d1, d2+d4, ySpeed, ySpeed, ySpeed, new int[0]); + world.spawnParticle(EnumParticleTypes.FLAME, d0-d4, d1, d2-d4, ySpeed, ySpeed, ySpeed, new int[0]); + } + if(rand.nextInt(3) == 3){ + world.spawnParticle(EnumParticleTypes.FLAME, d0-d4, d1, d2-d4, ySpeed, ySpeed, ySpeed, new int[0]); + world.spawnParticle(EnumParticleTypes.FLAME, d0+d4, d1, d2+d4, ySpeed, ySpeed, ySpeed, new int[0]); + } + } @Override public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, EnumFacing facing, float hitx, float hity, float hitz) { @@ -81,6 +106,7 @@ public class CastingBlock extends CustomContainerFacing { if(CommonUtils.randomCheck(2)){ tile.setSlotStack(0, ItemStack.EMPTY); } + //makeEmbers(world, pos, world.rand); return true; } if(tile.getSlotStack(0).getItem() == ModItems.cast_pickaxe){ diff --git a/1.11/src/main/java/nmd/primal/forgecraft/blocks/CastingForm.java b/1.11/src/main/java/nmd/primal/forgecraft/blocks/CastingForm.java index ce8c6d49..337b1b32 100644 --- a/1.11/src/main/java/nmd/primal/forgecraft/blocks/CastingForm.java +++ b/1.11/src/main/java/nmd/primal/forgecraft/blocks/CastingForm.java @@ -18,13 +18,10 @@ import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import nmd.primal.core.common.helper.CommonUtils; -import nmd.primal.core.common.items.tools.WorkMallet; import nmd.primal.forgecraft.ModInfo; -import nmd.primal.forgecraft.init.ModItems; import nmd.primal.forgecraft.tiles.TileCastingForm; import nmd.primal.forgecraft.util.CastingFormHandler; -import javax.annotation.Nullable; import java.util.Random; /** diff --git a/1.11/src/main/java/nmd/primal/forgecraft/blocks/IngotBall.java b/1.11/src/main/java/nmd/primal/forgecraft/blocks/IngotBall.java index f92a2c18..89c8aadc 100644 --- a/1.11/src/main/java/nmd/primal/forgecraft/blocks/IngotBall.java +++ b/1.11/src/main/java/nmd/primal/forgecraft/blocks/IngotBall.java @@ -16,7 +16,6 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import nmd.primal.core.api.PrimalStates; -import nmd.primal.core.common.helper.PlayerHelper; import java.util.Random; import java.util.concurrent.ThreadLocalRandom; diff --git a/1.11/src/main/java/nmd/primal/forgecraft/blocks/PistonBellows.java b/1.11/src/main/java/nmd/primal/forgecraft/blocks/PistonBellows.java index c8613d79..5959acc4 100644 --- a/1.11/src/main/java/nmd/primal/forgecraft/blocks/PistonBellows.java +++ b/1.11/src/main/java/nmd/primal/forgecraft/blocks/PistonBellows.java @@ -2,7 +2,6 @@ package nmd.primal.forgecraft.blocks; import net.minecraft.block.material.Material; import net.minecraft.block.properties.IProperty; -import net.minecraft.block.properties.PropertyBool; import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.EntityLivingBase; @@ -16,7 +15,6 @@ import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import nmd.primal.core.api.PrimalStates; import nmd.primal.forgecraft.ModInfo; import nmd.primal.forgecraft.init.ModSounds; import nmd.primal.forgecraft.tiles.TileBloomery; diff --git a/1.11/src/main/java/nmd/primal/forgecraft/init/ModBlocks.java b/1.11/src/main/java/nmd/primal/forgecraft/init/ModBlocks.java index 65518e92..c7656957 100644 --- a/1.11/src/main/java/nmd/primal/forgecraft/init/ModBlocks.java +++ b/1.11/src/main/java/nmd/primal/forgecraft/init/ModBlocks.java @@ -19,10 +19,10 @@ import net.minecraftforge.fml.common.registry.GameRegistry; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import nmd.primal.core.common.items.tools.WorkMallet; -import nmd.primal.forgecraft.blocks.*; import nmd.primal.forgecraft.blocks.Anvil.AnvilBase; import nmd.primal.forgecraft.blocks.Anvil.AnvilIron; import nmd.primal.forgecraft.blocks.Anvil.AnvilStone; +import nmd.primal.forgecraft.blocks.*; import nmd.primal.forgecraft.blocks.Crucibles.Crucible; import nmd.primal.forgecraft.blocks.Crucibles.CrucibleHot; import nmd.primal.forgecraft.items.ForgeHammer; diff --git a/1.11/src/main/java/nmd/primal/forgecraft/init/ModCrafting.java b/1.11/src/main/java/nmd/primal/forgecraft/init/ModCrafting.java index b44027a0..3c66454f 100644 --- a/1.11/src/main/java/nmd/primal/forgecraft/init/ModCrafting.java +++ b/1.11/src/main/java/nmd/primal/forgecraft/init/ModCrafting.java @@ -7,7 +7,6 @@ import net.minecraft.item.ItemStack; import net.minecraftforge.fml.common.registry.GameRegistry; import net.minecraftforge.oredict.OreDictionary; import net.minecraftforge.oredict.ShapedOreRecipe; -import nmd.primal.core.api.PrimalBlocks; import nmd.primal.core.api.PrimalItems; import nmd.primal.core.common.helper.CommonUtils; import nmd.primal.forgecraft.crafting.AnvilCrafting; @@ -934,28 +933,88 @@ public class ModCrafting { ); /*** Temp Clean Iron Sword ***/ //TODO uncomment this - /*AnvilCrafting.addRecipe( + AnvilCrafting.addRecipe( new String[] { empty,empty,empty,empty,empty, empty,empty,hotCleanChunk,empty,empty, empty,empty,hotCleanChunk,empty,empty, empty,hotCleanChunk,hotCleanChunk,hotCleanChunk,empty, empty,empty,hotCleanChunk,empty,empty }, - new ItemStack(ModItems.cleanironsword, 1), + new ItemStack(ModItems.cleanirongladius, 1), "null" - );*/ + ); /*** Temp Steel Sword ***/ - /*AnvilCrafting.addRecipe( + AnvilCrafting.addRecipe( new String[] { empty,empty,empty,empty,empty, empty,empty,hotSteelChunk,empty,empty, empty,empty,hotSteelChunk,empty,empty, empty,hotSteelChunk,hotSteelChunk,hotSteelChunk,empty, empty,empty,hotSteelChunk,empty,empty }, - new ItemStack(ModItems.steelsword, 1), + new ItemStack(ModItems.steelgladius, 1), "null" - );*/ + ); + /*** Temp Clean Iron LongSword ***/ + //TODO uncomment this + AnvilCrafting.addRecipe( + new String[] { + empty,empty,hotCleanChunk,empty,empty, + empty,empty,hotCleanChunk,empty,empty, + empty,empty,hotCleanChunk,empty,empty, + empty,hotCleanChunk,hotCleanChunk,hotCleanChunk,empty, + empty,empty,hotCleanChunk,empty,empty }, + new ItemStack(ModItems.cleanironlongsword, 1), + "null" + ); + /*** Temp Steel LongSword ***/ + AnvilCrafting.addRecipe( + new String[] { + empty,empty,hotSteelChunk,empty,empty, + empty,empty,hotSteelChunk,empty,empty, + empty,empty,hotSteelChunk,empty,empty, + empty,hotSteelChunk,hotSteelChunk,hotSteelChunk,empty, + empty,empty,hotSteelChunk,empty,empty }, + new ItemStack(ModItems.steellongsword, 1), + "null" + ); + /*** Temp WROUGHTIRON SLAYER ***/ + AnvilCrafting.addRecipe( + new String[] { + empty,empty,hotChunk,hotChunk,hotChunk, + empty,empty,hotChunk,hotChunk,empty, + empty,empty,hotChunk,hotChunk,empty, + empty,hotChunk,hotChunk,hotChunk,hotChunk, + empty,empty,hotChunk,hotChunk,empty }, + new ItemStack(ModItems.wroughtironslayer, 1), + "null" + ); + /*** Temp CLEANIRON SLAYER ***/ + AnvilCrafting.addRecipe( + new String[] { + empty,empty,hotCleanChunk,hotCleanChunk,hotCleanChunk, + empty,empty,hotCleanChunk,hotCleanChunk,empty, + empty,empty,hotCleanChunk,hotCleanChunk,empty, + empty,hotCleanChunk,hotCleanChunk,hotCleanChunk,hotCleanChunk, + empty,empty,hotCleanChunk,hotCleanChunk,empty }, + new ItemStack(ModItems.cleanironslayer, 1), + "null" + ); + /*** Temp STEELSLAYER ***/ + AnvilCrafting.addRecipe( + new String[] { + empty,empty,hotSteelChunk,hotSteelChunk,hotSteelChunk, + empty,empty,hotSteelChunk,hotSteelChunk,empty, + empty,empty,hotSteelChunk,hotSteelChunk,empty, + empty,hotSteelChunk,hotSteelChunk,hotSteelChunk,hotSteelChunk, + empty,empty,hotSteelChunk,hotSteelChunk,empty }, + new ItemStack(ModItems.steelslayer, 1), + "null" + ); + + + + /*** Flaked emerald ***/ AnvilCrafting.addRecipe( new String[] { diff --git a/1.11/src/main/java/nmd/primal/forgecraft/init/ModEvents.java b/1.11/src/main/java/nmd/primal/forgecraft/init/ModEvents.java index bd4960c9..e4383443 100644 --- a/1.11/src/main/java/nmd/primal/forgecraft/init/ModEvents.java +++ b/1.11/src/main/java/nmd/primal/forgecraft/init/ModEvents.java @@ -1,8 +1,6 @@ package nmd.primal.forgecraft.init; import net.minecraftforge.common.MinecraftForge; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; import nmd.primal.forgecraft.CommonEvents; /** diff --git a/1.11/src/main/java/nmd/primal/forgecraft/init/ModItems.java b/1.11/src/main/java/nmd/primal/forgecraft/init/ModItems.java index 0c1c89e2..506a174b 100644 --- a/1.11/src/main/java/nmd/primal/forgecraft/init/ModItems.java +++ b/1.11/src/main/java/nmd/primal/forgecraft/init/ModItems.java @@ -21,6 +21,7 @@ import nmd.primal.forgecraft.items.parts.ToolPart; import nmd.primal.forgecraft.items.tools.*; import nmd.primal.forgecraft.items.weapons.CustomShield; import nmd.primal.forgecraft.items.weapons.CustomSword; +import nmd.primal.forgecraft.items.weapons.SlayerSword; /** * Created by kitsu on 11/26/2016. @@ -104,9 +105,15 @@ public class ModItems { public static Item bronzegladius; public static Item wroughtirongladius; - //public static Item cleanironsword; - //public static Item steelsword; - //public static Item wootzsword; + public static Item cleanirongladius; + public static Item steelgladius; + + public static Item cleanironlongsword; + public static Item steellongsword; + + public static Item wroughtironslayer; + public static Item cleanironslayer; + public static Item steelslayer; public static Item wroughtironshield; //public static Item cleanironshield; @@ -195,12 +202,17 @@ public class ModItems { /********** WEAPONS **********/ - bronzegladius = new CustomSword("bronzegladius", PrimalMaterials.TOOL_BRONZE, 5D, 1D); - wroughtirongladius = new CustomSword("wroughtirongladius", PrimalMaterials.TOOL_WROUGHT_IRON, 4.5D, 3D); - //cleanironsword = new CustomSword("ironsword", PrimalMaterials.TOOL_CLEAN_IRON); - //steelsword = new CustomSword("ironsword", PrimalMaterials.TOOL_BASIC_STEEL); - //wootzsword = new CustomSword("ironsword", PrimalMaterials.TOOL_WOOTZ_STEEL); + bronzegladius = new CustomSword("bronzegladius", PrimalMaterials.TOOL_BRONZE, 5D, 2D); + wroughtirongladius = new CustomSword("wroughtirongladius", PrimalMaterials.TOOL_WROUGHT_IRON, 4.5D, -1.85D); + cleanirongladius = new CustomSword("cleanirongladius", PrimalMaterials.TOOL_CLEAN_IRON, 5D, -1.85D); + steelgladius = new CustomSword("steelgladius", PrimalMaterials.TOOL_BASIC_STEEL,6D, -1.85D); + cleanironlongsword = new CustomSword("cleanironlongsword", PrimalMaterials.TOOL_CLEAN_IRON, 7D, -2.5D); + steellongsword = new CustomSword("steellongsword", PrimalMaterials.TOOL_BASIC_STEEL,8D, -2.25D); + + wroughtironslayer = new SlayerSword("wroughtironslayer", PrimalMaterials.TOOL_WROUGHT_IRON, 11.5D, -3.7D); + cleanironslayer = new SlayerSword("cleanironslayer", PrimalMaterials.TOOL_CLEAN_IRON, 10D, -3.5D); + steelslayer = new SlayerSword("steelslayer", PrimalMaterials.TOOL_BASIC_STEEL,11D, -3.3D); wroughtironshield = new CustomShield("wroughtironshield", PrimalMaterials.TOOL_WROUGHT_IRON); @@ -306,7 +318,15 @@ public class ModItems { **********/ GameRegistry.register(wroughtirongladius); GameRegistry.register(bronzegladius); - //GameRegistry.register(wroughtironshield); + GameRegistry.register(cleanirongladius); + GameRegistry.register(steelgladius); + + GameRegistry.register(cleanironlongsword); + GameRegistry.register(steellongsword); + + GameRegistry.register(wroughtironslayer); + GameRegistry.register(cleanironslayer); + GameRegistry.register(steelslayer); //GameRegistry.register(matchlockmusket); //GameRegistry.register(forgingmanual); @@ -342,7 +362,6 @@ public class ModItems { registerRender(bronzeaxehead); registerRender(bronzeshovelhead); registerRender(bronzehoehead); - registerRender(bronzegladius); registerRender(pickaxehead); registerRender(ironaxehead); @@ -395,8 +414,20 @@ public class ModItems { /********** WEAPONS **********/ - registerRender(wroughtirongladius); registerRender(wroughtironshield); + + registerRender(bronzegladius); + registerRender(wroughtirongladius); + registerRender(cleanirongladius); + registerRender(steelgladius); + + registerRender(cleanironlongsword); + registerRender(steellongsword); + + registerRender(wroughtironslayer); + registerRender(cleanironslayer); + registerRender(steelslayer); + //registerRender(forgingmanual); //registerRender(matchlockmusket); } diff --git a/1.11/src/main/java/nmd/primal/forgecraft/items/ItemForgingManual.java b/1.11/src/main/java/nmd/primal/forgecraft/items/ItemForgingManual.java index 86d734f2..16347789 100644 --- a/1.11/src/main/java/nmd/primal/forgecraft/items/ItemForgingManual.java +++ b/1.11/src/main/java/nmd/primal/forgecraft/items/ItemForgingManual.java @@ -7,7 +7,6 @@ import net.minecraft.util.EnumActionResult; import net.minecraft.util.EnumHand; import net.minecraft.world.World; import nmd.primal.forgecraft.ForgeCraft; -import nmd.primal.forgecraft.ModInfo; /** * Created by mminaie on 2/4/17. diff --git a/1.11/src/main/java/nmd/primal/forgecraft/items/ItemSoftCrucible.java b/1.11/src/main/java/nmd/primal/forgecraft/items/ItemSoftCrucible.java index d66a2b51..ddf01d46 100644 --- a/1.11/src/main/java/nmd/primal/forgecraft/items/ItemSoftCrucible.java +++ b/1.11/src/main/java/nmd/primal/forgecraft/items/ItemSoftCrucible.java @@ -1,7 +1,5 @@ package nmd.primal.forgecraft.items; -import nmd.primal.forgecraft.ModInfo; - /** * Created by mminaie on 1/22/17. */ diff --git a/1.11/src/main/java/nmd/primal/forgecraft/items/ItemStoneTongs.java b/1.11/src/main/java/nmd/primal/forgecraft/items/ItemStoneTongs.java index 34f46601..ba6e6a22 100644 --- a/1.11/src/main/java/nmd/primal/forgecraft/items/ItemStoneTongs.java +++ b/1.11/src/main/java/nmd/primal/forgecraft/items/ItemStoneTongs.java @@ -16,9 +16,11 @@ import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import nmd.primal.core.api.PrimalStates; import nmd.primal.forgecraft.ModInfo; -import nmd.primal.forgecraft.blocks.*; +import nmd.primal.forgecraft.blocks.BloomeryBase; import nmd.primal.forgecraft.blocks.Crucibles.Crucible; import nmd.primal.forgecraft.blocks.Crucibles.CrucibleHot; +import nmd.primal.forgecraft.blocks.Forge; +import nmd.primal.forgecraft.blocks.IngotBall; import nmd.primal.forgecraft.init.ModBlocks; import nmd.primal.forgecraft.init.ModItems; import nmd.primal.forgecraft.tiles.TileBaseCrucible; diff --git a/1.11/src/main/java/nmd/primal/forgecraft/items/weapons/CustomSword.java b/1.11/src/main/java/nmd/primal/forgecraft/items/weapons/CustomSword.java index b1c90a6f..b0e60965 100644 --- a/1.11/src/main/java/nmd/primal/forgecraft/items/weapons/CustomSword.java +++ b/1.11/src/main/java/nmd/primal/forgecraft/items/weapons/CustomSword.java @@ -12,8 +12,6 @@ import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import nmd.primal.forgecraft.ModInfo; -import java.util.DoubleSummaryStatistics; - /** * Created by mminaie on 3/23/17. */ @@ -59,7 +57,7 @@ public class CustomSword extends ItemSword { if (equipmentSlot == EntityEquipmentSlot.MAINHAND) { multimap.put(SharedMonsterAttributes.ATTACK_DAMAGE.getName(), new AttributeModifier(ATTACK_DAMAGE_MODIFIER, "Weapon modifier", this.attack, 0)); - multimap.put(SharedMonsterAttributes.ATTACK_SPEED.getName(), new AttributeModifier(ATTACK_SPEED_MODIFIER, "Weapon modifier", -this.speed, 0)); + multimap.put(SharedMonsterAttributes.ATTACK_SPEED.getName(), new AttributeModifier(ATTACK_SPEED_MODIFIER, "Weapon modifier", this.speed, 0)); } return multimap; diff --git a/1.11/src/main/java/nmd/primal/forgecraft/items/weapons/SlayerSword.java b/1.11/src/main/java/nmd/primal/forgecraft/items/weapons/SlayerSword.java new file mode 100644 index 00000000..aaffbdaa --- /dev/null +++ b/1.11/src/main/java/nmd/primal/forgecraft/items/weapons/SlayerSword.java @@ -0,0 +1,76 @@ +package nmd.primal.forgecraft.items.weapons; + +import com.google.common.collect.HashMultimap; +import com.google.common.collect.Multimap; +import net.minecraft.entity.Entity; +import net.minecraft.entity.SharedMonsterAttributes; +import net.minecraft.entity.ai.attributes.AttributeModifier; +import net.minecraft.inventory.EntityEquipmentSlot; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.item.ItemSword; +import net.minecraft.world.World; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; +import nmd.primal.forgecraft.ModInfo; + +/** + * Created by mminaie on 6/25/17. + */ +public class SlayerSword extends ItemSword { + + private double attack, speed; + + public SlayerSword(String name, Item.ToolMaterial material, double attackDamage, double attackSpeed) { + super(material); + this.setUnlocalizedName(name); + this.setRegistryName(name); + this.setCreativeTab(ModInfo.TAB_FORGECRAFT); + this.setMaxStackSize(1); + this.setNoRepair(); + this.attack = attackDamage; + this.speed = attackSpeed; + + } + + @Override + public void onUpdate(ItemStack item, World world, Entity playerin, int itemSlot, boolean isSelected) { + + if(isSelected){ + playerin.setSprinting(false); + } + } + + @SideOnly(Side.CLIENT) + @Override + public boolean hasEffect(ItemStack stack) + { + return false; + } + + @Override + public boolean isRepairable() + { + return false; + } + + public int getItemEnchantability(ItemStack stack) + { + return 0; + } + + @Override + public Multimap getItemAttributeModifiers(EntityEquipmentSlot equipmentSlot) + { + Multimap multimap = HashMultimap.create(); + + if (equipmentSlot == EntityEquipmentSlot.MAINHAND) + { + multimap.put(SharedMonsterAttributes.ATTACK_DAMAGE.getName(), new AttributeModifier(ATTACK_DAMAGE_MODIFIER, "Weapon modifier", this.attack, 0)); + multimap.put(SharedMonsterAttributes.ATTACK_SPEED.getName(), new AttributeModifier(ATTACK_SPEED_MODIFIER, "Weapon modifier", this.speed, 0)); + } + + return multimap; + } + +} diff --git a/1.11/src/main/java/nmd/primal/forgecraft/renders/blocks/TileCastingBlockRender.java b/1.11/src/main/java/nmd/primal/forgecraft/renders/blocks/TileCastingBlockRender.java index 7d804a2e..94897ed5 100644 --- a/1.11/src/main/java/nmd/primal/forgecraft/renders/blocks/TileCastingBlockRender.java +++ b/1.11/src/main/java/nmd/primal/forgecraft/renders/blocks/TileCastingBlockRender.java @@ -11,12 +11,9 @@ import net.minecraft.item.Item; import net.minecraft.util.EnumFacing; import net.minecraft.util.math.BlockPos; import nmd.primal.forgecraft.blocks.CastingBlock; -import nmd.primal.forgecraft.blocks.CastingForm; import nmd.primal.forgecraft.blocks.CustomContainerFacing; -import nmd.primal.forgecraft.init.ModItems; import nmd.primal.forgecraft.items.casting.CastingPart; import nmd.primal.forgecraft.tiles.TileCastingBlock; -import nmd.primal.forgecraft.tiles.TileCastingForm; import org.lwjgl.opengl.GL11; /** diff --git a/1.11/src/main/java/nmd/primal/forgecraft/renders/blocks/TileCastingformRender.java b/1.11/src/main/java/nmd/primal/forgecraft/renders/blocks/TileCastingformRender.java index 5fd3ec70..b0f5325a 100644 --- a/1.11/src/main/java/nmd/primal/forgecraft/renders/blocks/TileCastingformRender.java +++ b/1.11/src/main/java/nmd/primal/forgecraft/renders/blocks/TileCastingformRender.java @@ -1,6 +1,5 @@ package nmd.primal.forgecraft.renders.blocks; -import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.OpenGlHelper; @@ -8,20 +7,12 @@ import net.minecraft.client.renderer.RenderItem; import net.minecraft.client.renderer.block.model.ItemCameraTransforms; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; -import net.minecraft.init.Items; -import net.minecraft.item.EnumDyeColor; import net.minecraft.item.Item; -import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumFacing; import net.minecraft.util.math.BlockPos; -import nmd.primal.core.api.PrimalItems; -import nmd.primal.forgecraft.blocks.Anvil.AnvilBase; -import nmd.primal.forgecraft.blocks.Anvil.AnvilStone; import nmd.primal.forgecraft.blocks.CastingForm; import nmd.primal.forgecraft.blocks.CustomContainerFacing; -import nmd.primal.forgecraft.blocks.IngotBall; import nmd.primal.forgecraft.init.ModItems; -import nmd.primal.forgecraft.items.BaseMultiItem; import nmd.primal.forgecraft.tiles.TileCastingForm; import org.lwjgl.opengl.GL11; diff --git a/1.11/src/main/java/nmd/primal/forgecraft/tiles/TileCastingBlock.java b/1.11/src/main/java/nmd/primal/forgecraft/tiles/TileCastingBlock.java index 213e68bf..f19a97be 100644 --- a/1.11/src/main/java/nmd/primal/forgecraft/tiles/TileCastingBlock.java +++ b/1.11/src/main/java/nmd/primal/forgecraft/tiles/TileCastingBlock.java @@ -1,8 +1,5 @@ package nmd.primal.forgecraft.tiles; -import net.minecraft.item.ItemStack; -import net.minecraft.util.NonNullList; - /** * Created by mminaie on 6/24/17. */ diff --git a/1.11/src/main/java/nmd/primal/forgecraft/tiles/TilePistonBellows.java b/1.11/src/main/java/nmd/primal/forgecraft/tiles/TilePistonBellows.java index 1ab4a66a..85bfad23 100644 --- a/1.11/src/main/java/nmd/primal/forgecraft/tiles/TilePistonBellows.java +++ b/1.11/src/main/java/nmd/primal/forgecraft/tiles/TilePistonBellows.java @@ -4,8 +4,6 @@ import net.minecraft.block.state.IBlockState; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.ITickable; import net.minecraft.world.World; -import nmd.primal.core.api.PrimalStates; -import nmd.primal.forgecraft.blocks.PistonBellows; import static nmd.primal.core.api.PrimalStates.ACTIVE; diff --git a/1.11/src/main/java/nmd/primal/forgecraft/util/BreakerHandler.java b/1.11/src/main/java/nmd/primal/forgecraft/util/BreakerHandler.java index 88e0c33a..794031c1 100644 --- a/1.11/src/main/java/nmd/primal/forgecraft/util/BreakerHandler.java +++ b/1.11/src/main/java/nmd/primal/forgecraft/util/BreakerHandler.java @@ -2,23 +2,16 @@ package nmd.primal.forgecraft.util; import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; -import net.minecraft.init.Blocks; -import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumFacing; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraftforge.oredict.OreDictionary; -import nmd.primal.core.api.PrimalBlocks; import nmd.primal.core.api.PrimalItems; import nmd.primal.core.common.helper.PlayerHelper; import nmd.primal.forgecraft.blocks.CustomContainerFacing; -import nmd.primal.forgecraft.init.ModBlocks; import nmd.primal.forgecraft.tiles.TileBreaker; -import java.util.Arrays; - -import static net.minecraftforge.oredict.OreDictionary.getOreIDs; import static nmd.primal.core.common.helper.CommonUtils.randomCheck; //import nmd.primal.forgecraft.CommonUtils; @@ -69,6 +62,24 @@ return false; world.setBlockToAir(pos.offset(face)); PlayerHelper.spawnItemOnGround(world, pos.offset(face), new ItemStack(PrimalItems.COPPER_DUST, randomChanceReturn(9, 1, 2))); + tile.getSlotStack(0).setItemDamage(tile.getSlotStack(0).getItemDamage() + 1); + } + if (hasOreName(smashStack, "oreTin")) { + world.setBlockToAir(pos.offset(face)); + PlayerHelper.spawnItemOnGround(world, pos.offset(face), new ItemStack(PrimalItems.TIN_DUST, randomChanceReturn(9, 1, 2))); + + tile.getSlotStack(0).setItemDamage(tile.getSlotStack(0).getItemDamage() + 1); + } + if (hasOreName(smashStack, "oreZinc")) { + world.setBlockToAir(pos.offset(face)); + PlayerHelper.spawnItemOnGround(world, pos.offset(face), new ItemStack(PrimalItems.ZINC_DUST, randomChanceReturn(9, 1, 2))); + + tile.getSlotStack(0).setItemDamage(tile.getSlotStack(0).getItemDamage() + 1); + } + if (hasOreName(smashStack, "oreGold")) { + world.setBlockToAir(pos.offset(face)); + PlayerHelper.spawnItemOnGround(world, pos.offset(face), new ItemStack(PrimalItems.GOLD_DUST, randomChanceReturn(9, 1, 2))); + tile.getSlotStack(0).setItemDamage(tile.getSlotStack(0).getItemDamage() + 1); } } else { diff --git a/1.11/src/main/resources/assets/forgecraft/lang/en_us.lang b/1.11/src/main/resources/assets/forgecraft/lang/en_us.lang index 52ecb7a4..f171feeb 100644 --- a/1.11/src/main/resources/assets/forgecraft/lang/en_us.lang +++ b/1.11/src/main/resources/assets/forgecraft/lang/en_us.lang @@ -96,8 +96,19 @@ item.cast_gladius.name=Gladius Cast item.cast_pickaxe.name=Pickaxe Cast item.cast_shovel.name=Shovel Cast item.cast_hoe.name=Hoe Cast +item.castingmud.name=Casting Mud + item.bronzegladius.name=Bronze Gladius item.wroughtirongladius.name=Wrought Iron Gladius +item.cleanirongladius.name=Clean Iron Gladius +item.steelgladius.name=Steel Gladius + +item.cleanironlongsword.name=Clean Iron Longsword +item.steellongsword.name=Steel Longsword + +item.wroughtironslayer.name=Wrought Iron Slayer +item.cleanironslayer.name=Wrought Iron Slayer +item.steelslayer.name=Wrought Iron Slayer item.ironingothot.name=Hot Iron Ingot item.ironchunkhot.name=Hot Iron Chunk diff --git a/1.11/src/main/resources/assets/forgecraft/models/item/cleanirongladius.json b/1.11/src/main/resources/assets/forgecraft/models/item/cleanirongladius.json new file mode 100644 index 00000000..9b8676a8 --- /dev/null +++ b/1.11/src/main/resources/assets/forgecraft/models/item/cleanirongladius.json @@ -0,0 +1,293 @@ +{ + "__comment": "Designed by Kitsushadow with Cubik Studio - https://cubik.studio", + "textures": { + "particle": "forgecraft:blocks/clean_iron_ingot", + "texture": "forgecraft:blocks/clean_iron_ingot", + "texture1": "blocks/planks_oak" + }, + "elements": [ + { + "__comment": "Cube23", + "from": [ 7.25, -5.5, 7.25 ], + "to": [ 9.25, 0, 8.75 ], + "faces": { + "down": { "uv": [ 7, 7.5, 9, 8.5 ], "texture": "#texture" }, + "up": { "uv": [ 7, 7.5, 9, 8.5 ], "texture": "#texture" }, + "north": { "uv": [ 7, 9, 9, 16 ], "texture": "#texture" }, + "south": { "uv": [ 7, 9, 9, 16 ], "texture": "#texture" }, + "west": { "uv": [ 7.5, 9, 8.5, 16 ], "texture": "#texture" }, + "east": { "uv": [ 7.5, 9, 8.5, 16 ], "texture": "#texture" } + } + }, + { + "__comment": "Cube24", + "from": [ 7, -8, 7 ], + "to": [ 9.5, -5.5, 9 ], + "faces": { + "down": { "uv": [ 6.5, 7, 9.5, 9 ], "texture": "#texture1" }, + "up": { "uv": [ 6.5, 7, 9.5, 9 ], "texture": "#texture1" }, + "north": { "uv": [ 6.5, 0, 9.5, 1 ], "texture": "#texture1" }, + "south": { "uv": [ 6.5, 0, 9.5, 1 ], "texture": "#texture1" }, + "west": { "uv": [ 7, 0, 9, 1 ], "texture": "#texture1" }, + "east": { "uv": [ 7, 0, 9, 1 ], "texture": "#texture1" } + } + }, + { + "__comment": "Cube25", + "from": [ 6.5, 0, 7.25 ], + "to": [ 10, 0.5, 8.75 ], + "faces": { + "down": { "uv": [ 5.5, 6.5, 10.5, 9.5 ], "texture": "#texture1" }, + "up": { "uv": [ 5.5, 6.5, 10.5, 9.5 ], "texture": "#texture1" }, + "north": { "uv": [ 5.5, 0, 10.5, 1 ], "texture": "#texture1" }, + "south": { "uv": [ 5.5, 0, 10.5, 1 ], "texture": "#texture1" }, + "west": { "uv": [ 6.5, 0, 9.5, 1 ], "texture": "#texture1" }, + "east": { "uv": [ 6.5, 0, 9.5, 1 ], "texture": "#texture1" } + } + }, + { + "__comment": "Cube23", + "from": [ 6.5, 1, 7.5 ], + "to": [ 10, 6, 8.5 ], + "faces": { + "down": { "uv": [ 7, 7.5, 9, 8.5 ], "texture": "#texture" }, + "up": { "uv": [ 7, 7.5, 9, 8.5 ], "texture": "#texture" }, + "north": { "uv": [ 7, 9, 9, 16 ], "texture": "#texture" }, + "south": { "uv": [ 7, 9, 9, 16 ], "texture": "#texture" }, + "west": { "uv": [ 7.5, 9, 8.5, 16 ], "texture": "#texture" }, + "east": { "uv": [ 7.5, 9, 8.5, 16 ], "texture": "#texture" } + } + }, + { + "__comment": "Cube28", + "from": [ 8, 1, 8.5 ], + "to": [ 8.5, 24, 8.501 ], + "faces": { + "down": { "uv": [ 7.5, 7, 8.5, 7.5 ], "texture": "#texture" }, + "up": { "uv": [ 7.5, 8.5, 8.5, 9 ], "texture": "#texture" }, + "north": { "uv": [ 7.5, 0, 8.5, 15 ], "texture": "#texture" }, + "south": { "uv": [ 7.5, 0, 8.5, 15 ], "texture": "#texture" }, + "west": { "uv": [ 8.5, 0, 9, 15 ], "texture": "#texture" }, + "east": { "uv": [ 7, 0, 7.5, 15 ], "texture": "#texture" } + } + }, + { + "__comment": "Cube32", + "from": [ 6.75, 21.5, 7.5 ], + "to": [ 9.75, 23, 8.5 ], + "faces": { + "down": { "uv": [ 7, 7.5, 9, 8.5 ], "texture": "#texture" }, + "up": { "uv": [ 7, 7.5, 9, 8.5 ], "texture": "#texture" }, + "north": { "uv": [ 7, 7, 9, 9.5 ], "texture": "#texture" }, + "south": { "uv": [ 7, 7, 9, 9.5 ], "texture": "#texture" }, + "west": { "uv": [ 7.5, 7, 8.5, 9.5 ], "texture": "#texture" }, + "east": { "uv": [ 7.5, 7, 8.5, 9.5 ], "texture": "#texture" } + } + }, + { + "__comment": "Cube32", + "from": [ 7.25, 24.5, 7.5 ], + "to": [ 9.25, 26, 8.5 ], + "faces": { + "down": { "uv": [ 7, 7.5, 9, 8.5 ], "texture": "#texture" }, + "up": { "uv": [ 7, 7.5, 9, 8.5 ], "texture": "#texture" }, + "north": { "uv": [ 7, 7, 9, 8 ], "texture": "#texture" }, + "south": { "uv": [ 7, 7, 9, 8 ], "texture": "#texture" }, + "west": { "uv": [ 7.5, 7, 8.5, 8 ], "texture": "#texture" }, + "east": { "uv": [ 7.5, 7, 8.5, 8 ], "texture": "#texture" } + } + }, + { + "__comment": "Cube9", + "from": [ 7.75, 27, 7.5 ], + "to": [ 8.75, 28, 8.5 ], + "faces": { + "down": { "uv": [ 8, 7.5, 8.5, 8 ], "texture": "#texture", "rotation": 180 }, + "up": { "uv": [ 8, 8, 8.5, 8.5 ], "texture": "#texture", "rotation": 180 }, + "north": { "uv": [ 8, 4.5, 8.5, 5.5 ], "texture": "#texture" }, + "south": { "uv": [ 7.5, 4.5, 8, 5.5 ], "texture": "#texture" }, + "west": { "uv": [ 7.5, 4.5, 8, 5.5 ], "texture": "#texture" }, + "east": { "uv": [ 8, 4.5, 8.5, 5.5 ], "texture": "#texture" } + } + }, + { + "__comment": "Cube28", + "from": [ 8, 1, 7.499 ], + "to": [ 8.5, 24, 7.5 ], + "faces": { + "down": { "uv": [ 7.5, 7, 8.5, 7.5 ], "texture": "#texture", "rotation": 180 }, + "up": { "uv": [ 7.5, 8.5, 8.5, 9 ], "texture": "#texture", "rotation": 180 }, + "north": { "uv": [ 7.5, 0, 8.5, 15 ], "texture": "#texture" }, + "south": { "uv": [ 7.5, 0, 8.5, 15 ], "texture": "#texture" }, + "west": { "uv": [ 7, 0, 7.5, 15 ], "texture": "#texture" }, + "east": { "uv": [ 8.5, 0, 9, 15 ], "texture": "#texture" } + } + }, + { + "__comment": "Cube14", + "from": [ 6, 0.5, 7.25 ], + "to": [ 10.5, 2.5, 8.75 ], + "faces": { + "down": { "uv": [ 6, 7.25, 10.5, 8.75 ], "texture": "#texture1" }, + "up": { "uv": [ 6, 7.25, 10.5, 8.75 ], "texture": "#texture1" }, + "north": { "uv": [ 5.5, 13.5, 10, 15.5 ], "texture": "#texture1" }, + "south": { "uv": [ 6, 13.5, 10.5, 15.5 ], "texture": "#texture1" }, + "west": { "uv": [ 7.25, 13.5, 8.75, 15.5 ], "texture": "#texture1" }, + "east": { "uv": [ 7.25, 13.5, 8.75, 15.5 ], "texture": "#texture1" } + } + }, + { + "__comment": "Cube11", + "from": [ 6.25, 0.5, 6.75 ], + "to": [ 10.25, 2.5, 9.25 ], + "faces": { + "down": { "uv": [ 6.25, 6.75, 10.25, 9.25 ], "texture": "#texture1" }, + "up": { "uv": [ 6.25, 6.75, 10.25, 9.25 ], "texture": "#texture1" }, + "north": { "uv": [ 5.75, 13.5, 9.75, 15.5 ], "texture": "#texture1" }, + "south": { "uv": [ 6.25, 13.5, 10.25, 15.5 ], "texture": "#texture1" }, + "west": { "uv": [ 6.75, 13.5, 9.25, 15.5 ], "texture": "#texture1" }, + "east": { "uv": [ 6.75, 13.5, 9.25, 15.5 ], "texture": "#texture1" } + } + }, + { + "__comment": "Cube13", + "from": [ 7, 23, 7.5 ], + "to": [ 9.5, 24.5, 8.5 ], + "faces": { + "down": { "uv": [ 7, 7.5, 9.5, 8.5 ], "texture": "#texture" }, + "up": { "uv": [ 7, 7.5, 9.5, 8.5 ], "texture": "#texture" }, + "north": { "uv": [ 6.5, 7.5, 9, 9 ], "texture": "#texture" }, + "south": { "uv": [ 7, 7.5, 9.5, 9 ], "texture": "#texture" }, + "west": { "uv": [ 7.5, 7.5, 8.5, 9 ], "texture": "#texture" }, + "east": { "uv": [ 7.5, 7.5, 8.5, 9 ], "texture": "#texture" } + } + }, + { + "__comment": "Cube14", + "from": [ 7.5, 26, 7.5 ], + "to": [ 9, 27, 8.5 ], + "faces": { + "down": { "uv": [ 7.5, 7.5, 9, 8.5 ], "texture": "#texture" }, + "up": { "uv": [ 7.5, 7.5, 9, 8.5 ], "texture": "#texture" }, + "north": { "uv": [ 7, 5, 8.5, 6 ], "texture": "#texture" }, + "south": { "uv": [ 7.5, 5, 9, 6 ], "texture": "#texture" }, + "west": { "uv": [ 7.5, 5, 8.5, 6 ], "texture": "#texture" }, + "east": { "uv": [ 7.5, 5, 8.5, 6 ], "texture": "#texture" } + } + }, + { + "__comment": "Cube15", + "from": [ 7, -7.5, 6.5 ], + "to": [ 9.5, -6, 9.5 ], + "faces": { + "down": { "uv": [ 7, 6.5, 9.5, 9.5 ], "texture": "#texture1" }, + "up": { "uv": [ 7, 6.5, 9.5, 9.5 ], "texture": "#texture1" }, + "north": { "uv": [ 6.5, 6, 9, 7.5 ], "texture": "#texture1" }, + "south": { "uv": [ 7, 6, 9.5, 7.5 ], "texture": "#texture1" }, + "west": { "uv": [ 6.5, 6, 9.5, 7.5 ], "texture": "#texture1" }, + "east": { "uv": [ 6.5, 6, 9.5, 7.5 ], "texture": "#texture1" } + } + }, + { + "__comment": "Cube16", + "from": [ 6.5, -7.5, 7 ], + "to": [ 10, -6, 9 ], + "faces": { + "down": { "uv": [ 6.5, 7, 10, 9 ], "texture": "#texture1" }, + "up": { "uv": [ 6.5, 7, 10, 9 ], "texture": "#texture1" }, + "north": { "uv": [ 6, 6, 9.5, 7.5 ], "texture": "#texture1" }, + "south": { "uv": [ 6.5, 6, 10, 7.5 ], "texture": "#texture1" }, + "west": { "uv": [ 7, 6, 9, 7.5 ], "texture": "#texture1" }, + "east": { "uv": [ 7, 6, 9, 7.5 ], "texture": "#texture1" } + } + }, + { + "__comment": "Cube17", + "from": [ 8, -8.5, 7.75 ], + "to": [ 8.5, -8, 8.25 ], + "faces": { + "down": { "uv": [ 8, 7.75, 8.5, 8.25 ], "texture": "#texture" }, + "up": { "uv": [ 8, 7.75, 8.5, 8.25 ], "texture": "#texture" }, + "north": { "uv": [ 7.5, 8, 8, 8.5 ], "texture": "#texture" }, + "south": { "uv": [ 8, 8, 8.5, 8.5 ], "texture": "#texture" }, + "west": { "uv": [ 7.75, 8, 8.25, 8.5 ], "texture": "#texture" }, + "east": { "uv": [ 7.75, 8, 8.25, 8.5 ], "texture": "#texture" } + } + }, + { + "__comment": "Cube24", + "from": [ 6.75, 6, 7.5 ], + "to": [ 9.75, 15.5, 8.5 ], + "faces": { + "down": { "uv": [ 6.75, 7.5, 9.75, 8.5 ], "texture": "#texture" }, + "up": { "uv": [ 6.75, 7.5, 9.75, 8.5 ], "texture": "#texture" }, + "north": { "uv": [ 6.25, 0.5, 9.25, 10 ], "texture": "#texture" }, + "south": { "uv": [ 6.75, 0.5, 9.75, 10 ], "texture": "#texture" }, + "west": { "uv": [ 7.5, 0.5, 8.5, 10 ], "texture": "#texture" }, + "east": { "uv": [ 7.5, 0.5, 8.5, 10 ], "texture": "#texture" } + } + }, + { + "__comment": "Cube19", + "from": [ 6.5, 15.5, 7.5 ], + "to": [ 10, 21.5, 8.5 ], + "faces": { + "down": { "uv": [ 6.5, 7.5, 10, 8.5 ], "texture": "#texture" }, + "up": { "uv": [ 6.5, 7.5, 10, 8.5 ], "texture": "#texture" }, + "north": { "uv": [ 6, 0, 9.5, 0.5 ], "texture": "#texture" }, + "south": { "uv": [ 6.5, 0, 10, 0.5 ], "texture": "#texture" }, + "west": { "uv": [ 7.5, 0, 8.5, 0.5 ], "texture": "#texture" }, + "east": { "uv": [ 7.5, 0, 8.5, 0.5 ], "texture": "#texture" } + } + }, + { + "__comment": "Cube20", + "from": [ 8, 27.75, 7.5 ], + "to": [ 8.5, 28.75, 8.5 ], + "faces": { + "down": { "uv": [ 8, 7.5, 8.5, 8.5 ], "texture": "#texture" }, + "up": { "uv": [ 8, 7.5, 8.5, 8.5 ], "texture": "#texture" }, + "north": { "uv": [ 7.5, 3.25, 8, 4.25 ], "texture": "#texture" }, + "south": { "uv": [ 8, 3.25, 8.5, 4.25 ], "texture": "#texture" }, + "west": { "uv": [ 7.5, 3.25, 8.5, 4.25 ], "texture": "#texture" }, + "east": { "uv": [ 7.5, 3.25, 8.5, 4.25 ], "texture": "#texture" } + } + } + ], + "display": { + "thirdperson_righthand": { + "rotation": [ 0, 90, 0 ], + "translation": [ 0, 5.9, 1.33 ], + "scale": [ 0.75, 0.75, 0.75 ] + }, + "thirdperson_lefthand": { + "rotation": [ 0, 90, 0 ], + "translation": [ 0, 5.9, 1.33 ], + "scale": [ 0.75, 0.75, 0.75 ] + }, + "firstperson_righthand": { + "rotation": [ 0, 90, 0 ], + "translation": [ 0, 6.6, 1 ], + "scale": [ 0.75, 0.75, 0.75 ] + }, + "firstperson_lefthand": { + "rotation": [ 0, 90, 0 ], + "translation": [ 0, 6.6, 1 ], + "scale": [ 0.75, 0.75, 0.75 ] + }, + "gui": { + "rotation": [ 0, 0, -45 ], + "translation": [ -0.4, -0.4, 0 ], + "scale": [ 0.5, 0.5, 0.5 ] + }, + "ground": { + "rotation": [ 90, 0, 0 ], + "scale": [ 0.75, 0.75, 0.75 ] + }, + "fixed": { + "rotation": [ 0, 0, 45 ], + "translation": [ 0.7, -0.7, 0 ], + "scale": [ 0.66, 0.66, 0.66 ] + } + } +} \ No newline at end of file diff --git a/1.11/src/main/resources/assets/forgecraft/models/item/cleanironlongsword.json b/1.11/src/main/resources/assets/forgecraft/models/item/cleanironlongsword.json new file mode 100644 index 00000000..2640195f --- /dev/null +++ b/1.11/src/main/resources/assets/forgecraft/models/item/cleanironlongsword.json @@ -0,0 +1,10 @@ +{ + "forge_marker":1, + "textures": { + "particle": "forgecraft:blocks/clean_iron_ingot", + "texture": "forgecraft:blocks/clean_iron_ingot", + "light": "forgecraft:blocks/clean_iron_ingot_light", + "dark": "forgecraft:blocks/clean_iron_ingot_dark" + }, + "parent": "forgecraft:item/longsword" +} \ No newline at end of file diff --git a/1.11/src/main/resources/assets/forgecraft/models/item/cleanironslayer.json b/1.11/src/main/resources/assets/forgecraft/models/item/cleanironslayer.json new file mode 100644 index 00000000..7822b45d --- /dev/null +++ b/1.11/src/main/resources/assets/forgecraft/models/item/cleanironslayer.json @@ -0,0 +1,10 @@ +{ + "forge_marker":1, + "textures": { + "particle": "forgecraft:blocks/clean_iron_ingot", + "texture": "forgecraft:blocks/clean_iron_ingot", + "light": "forgecraft:blocks/clean_iron_ingot_light", + "dark": "forgecraft:blocks/clean_iron_ingot_dark" + }, + "parent": "forgecraft:item/slayer" +} \ No newline at end of file diff --git a/1.11/src/main/resources/assets/forgecraft/models/item/e_particle.png b/1.11/src/main/resources/assets/forgecraft/models/item/e_particle.png new file mode 100644 index 0000000000000000000000000000000000000000..e557878f9b0081df0e6c571ed915f4780bf1a2fc GIT binary patch literal 159 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61SBU+%rFB|X`U{QAsV7vCj@daC~~-LPd)$i z?$?xTj^-IIp9ACFK7V={aJAiXe!J@v0mIGT4Z3dBCY+nlAN}mLRowa~J3GYg{eRVX zXUUaN&3PXSznt{pUt?*oMTj?KX|GSjMcIr5t;EiVqsx9UI;{|T9DHPlG0;W^Pgg&e IbxsLQ03WwL?f?J) literal 0 HcmV?d00001 diff --git a/1.11/src/main/resources/assets/forgecraft/models/item/e_texture.png b/1.11/src/main/resources/assets/forgecraft/models/item/e_texture.png new file mode 100644 index 0000000000000000000000000000000000000000..7291f2ea2b524eccecb6678f7bd40262c849bf2f GIT binary patch literal 141 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61SBU+%rFB|A)YRdAsV8|HWeQfm^B+%SKK&v zuFpfaoliDNDM&L$@~vsZp9Y?WbuQ1CZf4l2-1K~5=5VI@Msu3kk+ey<5-m~}YX2yNr$V|N7Zx9hO6C#3$ zznQUffYGz{22{Qu`ftjJzOhi9Gb54i|R29$jptXj~#C2VJvg)pHtsV4|vetr` zon}=%v_%AC3}hx$bu*~xb&63LS>OPms>n=?F}80+1Q7udVXcLT_%W54;qGTh)t4OZ zy&vbz?5wI*SX7DV$ScXMHL$xwReu_aMKK{FxI5hac)`rugE=QM^M_*Pq5Q~9Ff&Bt zY^e9XW%l0Dd;e)H76npv^8Nl}e(SVT^&++L>7Q z_kBZE52&g_Rq^-txBrDgtmkhgYptSsA}%7BbE37jgH$F~(f9i|SnaFzs7W_D6n kMdeL__1$(7_weom85D{vvoaagJol**| zH9kK-k$v9*5D}bnyx(tn?~E~cKA)tN08mv_mDlS<&KXt3IfqqMthH-A=Nusf&htb> zh%xehzey<(LZFm_h;YB($vI7UPMx_l}5AN}-g(G~GEz zj1hUgUVpV%i!p{NX-b))nrAa~A0HpI*09^Qv2EKb9%C@ZSXltp_;Z>VBi35BZNrKP zDJ5EK7-N=EDJ4{uTI-@CBCFXDm)m~^JR*4j$y?RGrIdpAo?0u`TDv}n_a5*4 oLX}cl&9`kM=gf6o3$v>72mR4Y2ZOXp;s5{u07*qoM6N<$f~#o;3jhEB literal 0 HcmV?d00001 diff --git a/1.11/src/main/resources/assets/forgecraft/textures/blocks/iron_ingot_dark.png b/1.11/src/main/resources/assets/forgecraft/textures/blocks/iron_ingot_dark.png new file mode 100644 index 0000000000000000000000000000000000000000..d2b804b1121deea05536cd5c1c8ad44b81cf0d65 GIT binary patch literal 464 zcmV;>0WbcEP)@lc@13<45wYjL-!E3k zX12At`@_&VC+^N#i#g}NelyI>Xsr$M%OO~t0zm6^Z~V2tsICo{K3ci$(LHx;M5qot>sSFs+)vEy=g zRCSMw$Obca=RD6HVP-x~Ez|C0tD=oDekqimdj|@js(oKm1|P@qD^f*S01>fEQ&cO? z`+dpGA3&ksW2>hwQzcQr6|LPPsXF)G$;?NU%a>wV<@*B=7f~S1=q{W90000|hDo%H2yTK3@{`*9ptRy6fxj0te>$i1z}bT=^vb6~Bt+1z#iowGD2 z`3^2f;}?%*PFrH~6*;nv!t_jyS!W$fVP`SJ5tcQ@TlSJN~A+0FHS zBM2gbngPH)Df>$L~ifThaOHol&7N)v)iQsMzgNWe$cgyqF>)iAkObs!k zGAT_Guv@#2L08>OpsFzw{QbW6fIHWpIVD4lDRgJ0uV5W#D{&6(35D^6E zEC3>6zhxpSG_WEOn#@8K96ssXK-ECe-8cOPnz|R53M$HUC#&(_zyC1CV2ts^Wv0(v zM4kn(yK-fss-T9e3Yoz+`!3BL*#@%R0n;s`n%DWdc`Hs9^E`K}e0&s9mAL!kMX8{* zyQ1!lv1c7qB7z9`{{9AF&V#CAt-wrgz@})12-kXV&`$iiW3+qQ=ffDzoRcy3yW92% zpl()k9QZuuR-^V%ulgTjRa2FyE>z{|!Z8mj0-y7Ebek!e^_*)35RBneC19uurb@(O z&I6B#hnksko?j2(F%KdZ@9Vl*$_C5AeGs|$2SPy-&x9-<$p8QV07*qoM6N<$f~C0h AA^-pY literal 0 HcmV?d00001 diff --git a/1.11/src/main/resources/assets/forgecraft/textures/blocks/steel_ingot_light.png b/1.11/src/main/resources/assets/forgecraft/textures/blocks/steel_ingot_light.png new file mode 100644 index 0000000000000000000000000000000000000000..9f98c3c8126f165b24ddf1a41150f01020071062 GIT binary patch literal 584 zcmV-O0=NB%P)`!g#5(Z?L0EC3YN#sXG02s0kyI6Wo{Or61~o%e zdA;6rKLo+w z?>8bsH<%gfMy?II*fRhh54s9brJJqB1V4@gfH4N==YzRn?nJB|=31CLxng@(1;9)Z zQMCI?eI=rT0G$QEx*k;~)lC6sETGA(oe|fnZVVx-fTX)I^DFV*1R}TzD#{##tipf) z{=;Jo#^XViqN=zXreLaw%2odcs%#>2TT#PRg_R3VwgnL)jPBZ@s$mzX=>99?{r%Fd zI9bfsH_VLTbw+;@&C5sQe$-}(!{oRg{|BJLV1ivorypU*)= zP?h-S_*^}YyPmIF=bSgw7z5P{>{2!76Q9qy-F#hEQdPI~$|5TKLQR?TNk-sv z&fB+{k(u`%5d^^)gRI;{rkENlg87_y#JXjh8L!vt2AuQBis1Mh_v0}Jm4%N%MDQOq WNg_!YN}zxM0000