diff --git a/build.prop b/build.prop index 383afce..a02a227 100644 --- a/build.prop +++ b/build.prop @@ -1,6 +1,6 @@ minecraft_version=1.7.10 -forge_version=10.13.4.1558-1.7.10 +forge_version=10.13.4.1566-1.7.10 tfc_version=0.79.27 -mod_version=1.11 +mod_version=1.12 mod_id=TerraFirmaPunkTweaks group_name=com.JAWolfe.TerraFirmaPunkTweaks \ No newline at end of file diff --git a/builds/TerraFirmaPunkTweaks-1.7.10-1.05.jar b/builds/TerraFirmaPunkTweaks-1.7.10-1.05.jar new file mode 100644 index 0000000..63b67e1 Binary files /dev/null and b/builds/TerraFirmaPunkTweaks-1.7.10-1.05.jar differ diff --git a/builds/TerraFirmaPunkTweaks-1.7.10-1.06.jar b/builds/TerraFirmaPunkTweaks-1.7.10-1.06.jar new file mode 100644 index 0000000..5707211 Binary files /dev/null and b/builds/TerraFirmaPunkTweaks-1.7.10-1.06.jar differ diff --git a/builds/TerraFirmaPunkTweaks-1.7.10-1.07.jar b/builds/TerraFirmaPunkTweaks-1.7.10-1.07.jar new file mode 100644 index 0000000..d54196b Binary files /dev/null and b/builds/TerraFirmaPunkTweaks-1.7.10-1.07.jar differ diff --git a/builds/TerraFirmaPunkTweaks-1.7.10-1.08.jar b/builds/TerraFirmaPunkTweaks-1.7.10-1.08.jar new file mode 100644 index 0000000..3f5cc33 Binary files /dev/null and b/builds/TerraFirmaPunkTweaks-1.7.10-1.08.jar differ diff --git a/builds/TerraFirmaPunkTweaks-1.7.10-1.09.jar b/builds/TerraFirmaPunkTweaks-1.7.10-1.09.jar new file mode 100644 index 0000000..49bf736 Binary files /dev/null and b/builds/TerraFirmaPunkTweaks-1.7.10-1.09.jar differ diff --git a/builds/TerraFirmaPunkTweaks-1.7.10-1.10.jar b/builds/TerraFirmaPunkTweaks-1.7.10-1.10.jar new file mode 100644 index 0000000..e186523 Binary files /dev/null and b/builds/TerraFirmaPunkTweaks-1.7.10-1.10.jar differ diff --git a/builds/TerraFirmaPunkTweaks-1.7.10-1.12.jar b/builds/TerraFirmaPunkTweaks-1.7.10-1.12.jar new file mode 100644 index 0000000..485d671 Binary files /dev/null and b/builds/TerraFirmaPunkTweaks-1.7.10-1.12.jar differ diff --git a/builds/TerraFirmaPunkTweaks-1.7.10-deobf-1.11.jar b/builds/TerraFirmaPunkTweaks-1.7.10-deobf-1.11.jar deleted file mode 100644 index b9b5008..0000000 Binary files a/builds/TerraFirmaPunkTweaks-1.7.10-deobf-1.11.jar and /dev/null differ diff --git a/builds/TerraFirmaPunkTweaks-1.7.10-src-1.11.jar b/builds/TerraFirmaPunkTweaks-1.7.10-src-1.11.jar deleted file mode 100644 index e7ef3f7..0000000 Binary files a/builds/TerraFirmaPunkTweaks-1.7.10-src-1.11.jar and /dev/null differ diff --git a/builds/[1.7.10]TerraFirmaPunkTweaks-1.00.jar b/builds/[1.7.10]TerraFirmaPunkTweaks-1.00.jar new file mode 100644 index 0000000..76f4e06 Binary files /dev/null and b/builds/[1.7.10]TerraFirmaPunkTweaks-1.00.jar differ diff --git a/builds/[1.7.10]TerraFirmaPunkTweaks-1.01.jar b/builds/[1.7.10]TerraFirmaPunkTweaks-1.01.jar new file mode 100644 index 0000000..ecc4411 Binary files /dev/null and b/builds/[1.7.10]TerraFirmaPunkTweaks-1.01.jar differ diff --git a/builds/[1.7.10]TerraFirmaPunkTweaks-1.02.jar b/builds/[1.7.10]TerraFirmaPunkTweaks-1.02.jar new file mode 100644 index 0000000..02e346e Binary files /dev/null and b/builds/[1.7.10]TerraFirmaPunkTweaks-1.02.jar differ diff --git a/builds/[1.7.10]TerraFirmaPunkTweaks-1.03.jar b/builds/[1.7.10]TerraFirmaPunkTweaks-1.03.jar new file mode 100644 index 0000000..058dc1d Binary files /dev/null and b/builds/[1.7.10]TerraFirmaPunkTweaks-1.03.jar differ diff --git a/changelog.txt b/changelog.txt index a3b34c3..1aaa416 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,6 +1,11 @@ Changelog ================================================= ------------------------------------------------- +TFP Tweaks 1.12 +------------------------------------------------- +New Features ++Added new metal press molds for immersive engineering +------------------------------------------------- TFP Tweaks 1.11 ------------------------------------------------- New Features diff --git a/src/main/java/com/JAWolfe/terrafirmapunktweaks/items/MetalMold.java b/src/main/java/com/JAWolfe/terrafirmapunktweaks/items/MetalMold.java new file mode 100644 index 0000000..b3dcc35 --- /dev/null +++ b/src/main/java/com/JAWolfe/terrafirmapunktweaks/items/MetalMold.java @@ -0,0 +1,44 @@ +package com.JAWolfe.terrafirmapunktweaks.items; + +import com.JAWolfe.terrafirmapunktweaks.reference.References; +import com.bioxx.tfc.Reference; +import com.bioxx.tfc.Items.ItemTerra; +import com.bioxx.tfc.api.Enums.EnumSize; +import com.bioxx.tfc.api.Enums.EnumWeight; + +import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.item.ItemStack; +import net.minecraft.util.IIcon; + +public class MetalMold extends ItemTerra +{ + public MetalMold() + { + super(); + setMaxDamage(0); + setHasSubtypes(true); + } + + @Override + public int getMetadata(int i) + { + return i; + } + + @Override + public void registerIcons(IIconRegister registerer) + { + this.itemIcon = registerer.registerIcon(References.ModID + ":" + this.getUnlocalizedName().replace("item.", "")); + } + + @Override + public EnumSize getSize(ItemStack is) + { + return EnumSize.TINY; + } + @Override + public EnumWeight getWeight(ItemStack is) + { + return EnumWeight.LIGHT; + } +} diff --git a/src/main/java/com/JAWolfe/terrafirmapunktweaks/items/TFPItems.java b/src/main/java/com/JAWolfe/terrafirmapunktweaks/items/TFPItems.java index c26e1e0..1ca0028 100644 --- a/src/main/java/com/JAWolfe/terrafirmapunktweaks/items/TFPItems.java +++ b/src/main/java/com/JAWolfe/terrafirmapunktweaks/items/TFPItems.java @@ -12,6 +12,12 @@ public class TFPItems { public static Item CustomBucketOil; public static Item CustomBucketBlood; + public static Item BlockMold; + public static Item FenceMold; + public static Item HalfSlabMold; + public static Item MechCompMold; + public static Item PistonMold; + public static Item WireCoilMold; public static void initialise() { @@ -27,5 +33,22 @@ public class TFPItems CustomBucketBlood = new CustomBucketBlood(TFPBlocks.tfpBlood, TFCItems.woodenBucketEmpty).setUnlocalizedName("Wooden Bucket Blood"); GameRegistry.registerItem(CustomBucketBlood, CustomBucketBlood.getUnlocalizedName()); } + + if(Loader.isModLoaded("ImmersiveEngineering")) + { + BlockMold = new MetalMold().setUnlocalizedName("Block Mold"); + FenceMold = new MetalMold().setUnlocalizedName("Fence Mold"); + HalfSlabMold = new MetalMold().setUnlocalizedName("Half Slab Mold"); + MechCompMold = new MetalMold().setUnlocalizedName("Mechanical Component Mold"); + PistonMold = new MetalMold().setUnlocalizedName("Piston Mold"); + WireCoilMold = new MetalMold().setUnlocalizedName("Wire Coil Mold"); + + GameRegistry.registerItem(BlockMold, BlockMold.getUnlocalizedName()); + GameRegistry.registerItem(FenceMold, FenceMold.getUnlocalizedName()); + GameRegistry.registerItem(HalfSlabMold, HalfSlabMold.getUnlocalizedName()); + GameRegistry.registerItem(MechCompMold, MechCompMold.getUnlocalizedName()); + GameRegistry.registerItem(PistonMold, PistonMold.getUnlocalizedName()); + GameRegistry.registerItem(WireCoilMold, WireCoilMold.getUnlocalizedName()); + } } } diff --git a/src/main/resources/assets/terrafirmapunktweaks/lang/en_US.lang b/src/main/resources/assets/terrafirmapunktweaks/lang/en_US.lang index b16e976..a81c782 100644 --- a/src/main/resources/assets/terrafirmapunktweaks/lang/en_US.lang +++ b/src/main/resources/assets/terrafirmapunktweaks/lang/en_US.lang @@ -16,6 +16,12 @@ gui.tfptweaks.steamtank=Steam Tank #========= item.Wooden Bucket Oil.name=Wooden Bucket (Oil) item.Wooden Bucket Blood.name=Wooden Bucket (Blood) +item.Block Mold.name=Metal Press Mold: Block +item.Fence Mold.name=Metal Press Mold: Fence +item.Half Slab Mold.name=Metal Press Mold: Half Slab +item.Mechanical Component Mold.name=Metal Press Mold: Mechanical Component +item.Piston Mold.name=Metal Press Mold: Piston +item.Wire Coil Mold.name=Metal Press Mold: Wire Coil #=========== #= Effects = diff --git a/src/main/resources/assets/terrafirmapunktweaks/textures/items/Blank Mold.png b/src/main/resources/assets/terrafirmapunktweaks/textures/items/Blank Mold.png new file mode 100644 index 0000000..0b76ace Binary files /dev/null and b/src/main/resources/assets/terrafirmapunktweaks/textures/items/Blank Mold.png differ diff --git a/src/main/resources/assets/terrafirmapunktweaks/textures/items/Block Mold.png b/src/main/resources/assets/terrafirmapunktweaks/textures/items/Block Mold.png new file mode 100644 index 0000000..1861996 Binary files /dev/null and b/src/main/resources/assets/terrafirmapunktweaks/textures/items/Block Mold.png differ diff --git a/src/main/resources/assets/terrafirmapunktweaks/textures/items/Fence Mold.png b/src/main/resources/assets/terrafirmapunktweaks/textures/items/Fence Mold.png new file mode 100644 index 0000000..9008ed2 Binary files /dev/null and b/src/main/resources/assets/terrafirmapunktweaks/textures/items/Fence Mold.png differ diff --git a/src/main/resources/assets/terrafirmapunktweaks/textures/items/Half Slab Mold.png b/src/main/resources/assets/terrafirmapunktweaks/textures/items/Half Slab Mold.png new file mode 100644 index 0000000..3e13c3c Binary files /dev/null and b/src/main/resources/assets/terrafirmapunktweaks/textures/items/Half Slab Mold.png differ diff --git a/src/main/resources/assets/terrafirmapunktweaks/textures/items/Mechanical Component Mold.png b/src/main/resources/assets/terrafirmapunktweaks/textures/items/Mechanical Component Mold.png new file mode 100644 index 0000000..06b6ee0 Binary files /dev/null and b/src/main/resources/assets/terrafirmapunktweaks/textures/items/Mechanical Component Mold.png differ diff --git a/src/main/resources/assets/terrafirmapunktweaks/textures/items/Piston Mold.png b/src/main/resources/assets/terrafirmapunktweaks/textures/items/Piston Mold.png new file mode 100644 index 0000000..2c181ae Binary files /dev/null and b/src/main/resources/assets/terrafirmapunktweaks/textures/items/Piston Mold.png differ diff --git a/src/main/resources/assets/terrafirmapunktweaks/textures/items/Wire Coil Mold.png b/src/main/resources/assets/terrafirmapunktweaks/textures/items/Wire Coil Mold.png new file mode 100644 index 0000000..7a29742 Binary files /dev/null and b/src/main/resources/assets/terrafirmapunktweaks/textures/items/Wire Coil Mold.png differ