From 228cc90b8c5b0628a3ad97175e19f9105dcccec0 Mon Sep 17 00:00:00 2001 From: Shnupbups Date: Mon, 25 Jun 2018 22:40:32 +1000 Subject: [PATCH] 1.0.3 Added Golden Amber material. Does good damage, but is... pretty bad at everything else. Also added 'Gilded' trait, which lets axes harvest Golden Amber from Golden Oak logs. Trait is on Gravitite and Golden Amber. Small preparations for things to come. --- build.gradle | 2 +- .../tinkersaether/TinkersAether.java | 2 +- .../tinkersaether/config/TAConfig.java | 8 +++++ .../tinkersaether/misc/OreDictAether.java | 1 + .../tinkersaether/modules/ModuleBase.java | 16 +++++++++- .../tinkersaether/traits/Gilded.java | 32 +++++++++++++++++++ .../assets/tinkersaether/lang/en_us.lang | 5 +++ src/main/resources/mcmod.info | 2 +- 8 files changed, 64 insertions(+), 4 deletions(-) create mode 100644 src/main/java/shnupbups/tinkersaether/traits/Gilded.java diff --git a/build.gradle b/build.gradle index 73f5799..329f03c 100644 --- a/build.gradle +++ b/build.gradle @@ -11,7 +11,7 @@ apply plugin: 'net.minecraftforge.gradle.forge' //Only edit below this line, the above code adds and enables the necessary things for Forge to be setup. -version = "1.0.2" +version = "1.0.3" group = "shnupbups.tinkersaether" // http://maven.apache.org/guides/mini/guide-naming-conventions.html archivesBaseName = "tinkersaether" diff --git a/src/main/java/shnupbups/tinkersaether/TinkersAether.java b/src/main/java/shnupbups/tinkersaether/TinkersAether.java index 4d72bac..81aabc6 100644 --- a/src/main/java/shnupbups/tinkersaether/TinkersAether.java +++ b/src/main/java/shnupbups/tinkersaether/TinkersAether.java @@ -26,7 +26,7 @@ public class TinkersAether { public static final String modid = "tinkersaether"; public static final String name = "MoreTiC"; - public static final String version = "1.0.2"; + public static final String version = "1.0.3"; @Mod.Instance(modid) public static TinkersAether instance; diff --git a/src/main/java/shnupbups/tinkersaether/config/TAConfig.java b/src/main/java/shnupbups/tinkersaether/config/TAConfig.java index 1626877..8adff42 100644 --- a/src/main/java/shnupbups/tinkersaether/config/TAConfig.java +++ b/src/main/java/shnupbups/tinkersaether/config/TAConfig.java @@ -28,6 +28,14 @@ public class TAConfig extends Configuration { @Config.RequiresMcRestart public static boolean gravitite = true; + @Config.Comment("Whether Golden Amber is enabled or not.") + @Config.RequiresMcRestart + public static boolean goldenamber = true; + + /*@Config.Comment("Whether Valkyrie is enabled or not.") + @Config.RequiresMcRestart + public static boolean valkyrie = true;*/ + @Config.Comment("Whether Darts and Dart Shooters are enabled or not.") @Config.RequiresMcRestart public static boolean darts = true; diff --git a/src/main/java/shnupbups/tinkersaether/misc/OreDictAether.java b/src/main/java/shnupbups/tinkersaether/misc/OreDictAether.java index a1e8080..e1f24e7 100644 --- a/src/main/java/shnupbups/tinkersaether/misc/OreDictAether.java +++ b/src/main/java/shnupbups/tinkersaether/misc/OreDictAether.java @@ -13,5 +13,6 @@ public static void register() { OreDictionary.registerOre("logSkyroot",new ItemStack(BlocksAether.aether_log,1,1)); OreDictionary.registerOre("stickSkyroot", ItemsAether.skyroot_stick); OreDictionary.registerOre("holystone",BlocksAether.holystone); + OreDictionary.registerOre("gemGoldenAmber",ItemsAether.golden_amber); } } diff --git a/src/main/java/shnupbups/tinkersaether/modules/ModuleBase.java b/src/main/java/shnupbups/tinkersaether/modules/ModuleBase.java index 886ea39..5982c6c 100644 --- a/src/main/java/shnupbups/tinkersaether/modules/ModuleBase.java +++ b/src/main/java/shnupbups/tinkersaether/modules/ModuleBase.java @@ -30,7 +30,7 @@ public ModuleBase() { public static final Material skyroot = Materials.mat("skyroot", 0x6C633E); public static final Material holystone = Materials.mat("holystone", 0xA8AAA8); - public static final Material goldenAmber = Materials.mat("goldenamber", 0xFFDD11); + public static final Material goldenAmber = Materials.mat("goldenamber", 0xFFDF1A); public static final Material zanite = Materials.mat("zanite", 0x6611DD); public static final Material gravitite = Materials.mat("gravitite", 0xCC55AA); public static final Material valkyrie = Materials.mat("valkyrie", 0xEEEEDD); @@ -97,11 +97,25 @@ public void preInit() { gravitite.addItem("blockEnchantedGravitite", 1, Material.VALUE_Ingot); gravitite.addTrait(Antigrav.antigrav, MaterialTypes.HEAD); gravitite.addTrait(Launching.launching, MaterialTypes.HEAD); + gravitite.addTrait(Gilded.gilded, MaterialTypes.HEAD); gravitite.addTrait(Launching.launching); MaterialIntegration gravititeMi = new MaterialIntegration(null, gravitite, FluidHelper.createFluid(gravitite, 900), null).setRepresentativeItem("blockEnchantedGravitite"); TinkerRegistry.integrate(gravititeMi).preInit(); } + if(TAConfig.goldenamber) { + TinkerRegistry.addMaterialStats(goldenAmber, + new HeadMaterialStats(300, 1.50f, 7.20f, STONE), + new HandleMaterialStats(0.7f, 40), + new ExtraMaterialStats(30), + TinkersAether.plzNo); + goldenAmber.setCraftable(true).setCastable(false); + goldenAmber.addItem("gemGoldenAmber", 1, Material.VALUE_Ingot); + goldenAmber.addTrait(Gilded.gilded); + MaterialIntegration goldenAmberMi = new MaterialIntegration(goldenAmber).setRepresentativeItem("gemGoldenAmber"); + TinkerRegistry.integrate(goldenAmberMi).preInit(); + } + TinkersAether.logger.info("Base Module - Materials Registered"); TinkersAether.logger.info("Base Module - End PreInit"); diff --git a/src/main/java/shnupbups/tinkersaether/traits/Gilded.java b/src/main/java/shnupbups/tinkersaether/traits/Gilded.java new file mode 100644 index 0000000..a548991 --- /dev/null +++ b/src/main/java/shnupbups/tinkersaether/traits/Gilded.java @@ -0,0 +1,32 @@ +package shnupbups.tinkersaether.traits; + +import com.legacy.aether.blocks.BlocksAether; +import com.legacy.aether.blocks.util.EnumLogType; +import com.legacy.aether.items.ItemsAether; +import net.minecraft.block.properties.PropertyEnum; +import net.minecraft.block.state.IBlockState; +import net.minecraft.entity.EntityLivingBase; +import net.minecraft.entity.item.EntityItem; +import net.minecraft.item.ItemStack; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.World; +import slimeknights.tconstruct.library.traits.AbstractTrait; + +public class Gilded extends AbstractTrait { + public static final Gilded gilded = new Gilded(); + + public Gilded() { + super("gilded",0xFFDD11); + } + + @Override + public void afterBlockBreak(ItemStack tool, World world, IBlockState state, BlockPos pos, EntityLivingBase player, boolean wasEffective) { + if (!world.isRemote && state.getBlock().equals(BlocksAether.aether_log) && wasEffective) { + if (state.getValue(PropertyEnum.create("aether_logs", EnumLogType.class)) == EnumLogType.Oak) { + EntityItem amb = new EntityItem(world, pos.getX(), pos.getY(), pos.getZ()); + amb.setItem(new ItemStack(ItemsAether.golden_amber, 1 + random.nextInt(2))); + world.spawnEntity(amb); + } + } + } +} diff --git a/src/main/resources/assets/tinkersaether/lang/en_us.lang b/src/main/resources/assets/tinkersaether/lang/en_us.lang index 33f1d96..379c35e 100644 --- a/src/main/resources/assets/tinkersaether/lang/en_us.lang +++ b/src/main/resources/assets/tinkersaether/lang/en_us.lang @@ -2,8 +2,11 @@ material.gravitite.name=Gravitite material.zanite.name=Zanite material.skyroot.name=Skyroot material.holystone.name=Holystone +material.goldenamber.name=Golden Amber +material.valkyrie.name=Valkyrie fluid.gravitite.name=Molten Gravitite +fluid.valkyrie.name=Molten Valkyrie Metal item.dart_shooter.name=Dart Shooter item.dart_shooter.desc=The Dart Shooter, or Blowgun, lets you shoot darts with great accuracy.\nJust try not to inhale! @@ -25,5 +28,7 @@ modifier.rooted.desc=§oFirst ones double.§r\nExtra drops from naturally genera modifier.zany.name=Zany modifier.zany.desc=§oEntropy powered speed.§r\nThe tool mines considerably faster as it wears out. modifier.zany.extra=Zany Speed: x%s +modifier.gilded.name=Gilded +modifier.gilded.desc=§oShiny sap!§r\nGolden Amber can be harvested from Golden Oak logs. tinkersaether.config.title=Tinker's Aether Configuration \ No newline at end of file diff --git a/src/main/resources/mcmod.info b/src/main/resources/mcmod.info index 4e0a0ec..3991198 100644 --- a/src/main/resources/mcmod.info +++ b/src/main/resources/mcmod.info @@ -3,7 +3,7 @@ "modid": "tinkersaether", "name": "Tinker's Aether", "description": "Adds Aether materials and stuff to Tinker's Construct.", - "version": "1.0.2", + "version": "1.0.3", "mcversion": "${mcversion}", "url": "", "updateUrl": "",