Skip to content

Commit 228cc90

Browse files
committed
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.
1 parent 804fa4c commit 228cc90

File tree

8 files changed

+64
-4
lines changed

8 files changed

+64
-4
lines changed

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ apply plugin: 'net.minecraftforge.gradle.forge'
1111
//Only edit below this line, the above code adds and enables the necessary things for Forge to be setup.
1212

1313

14-
version = "1.0.2"
14+
version = "1.0.3"
1515
group = "shnupbups.tinkersaether" // http://maven.apache.org/guides/mini/guide-naming-conventions.html
1616
archivesBaseName = "tinkersaether"
1717

src/main/java/shnupbups/tinkersaether/TinkersAether.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
public class TinkersAether {
2727
public static final String modid = "tinkersaether";
2828
public static final String name = "MoreTiC";
29-
public static final String version = "1.0.2";
29+
public static final String version = "1.0.3";
3030

3131
@Mod.Instance(modid)
3232
public static TinkersAether instance;

src/main/java/shnupbups/tinkersaether/config/TAConfig.java

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,14 @@ public class TAConfig extends Configuration {
2828
@Config.RequiresMcRestart
2929
public static boolean gravitite = true;
3030

31+
@Config.Comment("Whether Golden Amber is enabled or not.")
32+
@Config.RequiresMcRestart
33+
public static boolean goldenamber = true;
34+
35+
/*@Config.Comment("Whether Valkyrie is enabled or not.")
36+
@Config.RequiresMcRestart
37+
public static boolean valkyrie = true;*/
38+
3139
@Config.Comment("Whether Darts and Dart Shooters are enabled or not.")
3240
@Config.RequiresMcRestart
3341
public static boolean darts = true;

src/main/java/shnupbups/tinkersaether/misc/OreDictAether.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,5 +13,6 @@ public static void register() {
1313
OreDictionary.registerOre("logSkyroot",new ItemStack(BlocksAether.aether_log,1,1));
1414
OreDictionary.registerOre("stickSkyroot", ItemsAether.skyroot_stick);
1515
OreDictionary.registerOre("holystone",BlocksAether.holystone);
16+
OreDictionary.registerOre("gemGoldenAmber",ItemsAether.golden_amber);
1617
}
1718
}

src/main/java/shnupbups/tinkersaether/modules/ModuleBase.java

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ public ModuleBase() {
3030

3131
public static final Material skyroot = Materials.mat("skyroot", 0x6C633E);
3232
public static final Material holystone = Materials.mat("holystone", 0xA8AAA8);
33-
public static final Material goldenAmber = Materials.mat("goldenamber", 0xFFDD11);
33+
public static final Material goldenAmber = Materials.mat("goldenamber", 0xFFDF1A);
3434
public static final Material zanite = Materials.mat("zanite", 0x6611DD);
3535
public static final Material gravitite = Materials.mat("gravitite", 0xCC55AA);
3636
public static final Material valkyrie = Materials.mat("valkyrie", 0xEEEEDD);
@@ -97,11 +97,25 @@ public void preInit() {
9797
gravitite.addItem("blockEnchantedGravitite", 1, Material.VALUE_Ingot);
9898
gravitite.addTrait(Antigrav.antigrav, MaterialTypes.HEAD);
9999
gravitite.addTrait(Launching.launching, MaterialTypes.HEAD);
100+
gravitite.addTrait(Gilded.gilded, MaterialTypes.HEAD);
100101
gravitite.addTrait(Launching.launching);
101102
MaterialIntegration gravititeMi = new MaterialIntegration(null, gravitite, FluidHelper.createFluid(gravitite, 900), null).setRepresentativeItem("blockEnchantedGravitite");
102103
TinkerRegistry.integrate(gravititeMi).preInit();
103104
}
104105

106+
if(TAConfig.goldenamber) {
107+
TinkerRegistry.addMaterialStats(goldenAmber,
108+
new HeadMaterialStats(300, 1.50f, 7.20f, STONE),
109+
new HandleMaterialStats(0.7f, 40),
110+
new ExtraMaterialStats(30),
111+
TinkersAether.plzNo);
112+
goldenAmber.setCraftable(true).setCastable(false);
113+
goldenAmber.addItem("gemGoldenAmber", 1, Material.VALUE_Ingot);
114+
goldenAmber.addTrait(Gilded.gilded);
115+
MaterialIntegration goldenAmberMi = new MaterialIntegration(goldenAmber).setRepresentativeItem("gemGoldenAmber");
116+
TinkerRegistry.integrate(goldenAmberMi).preInit();
117+
}
118+
105119
TinkersAether.logger.info("Base Module - Materials Registered");
106120

107121
TinkersAether.logger.info("Base Module - End PreInit");
Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
package shnupbups.tinkersaether.traits;
2+
3+
import com.legacy.aether.blocks.BlocksAether;
4+
import com.legacy.aether.blocks.util.EnumLogType;
5+
import com.legacy.aether.items.ItemsAether;
6+
import net.minecraft.block.properties.PropertyEnum;
7+
import net.minecraft.block.state.IBlockState;
8+
import net.minecraft.entity.EntityLivingBase;
9+
import net.minecraft.entity.item.EntityItem;
10+
import net.minecraft.item.ItemStack;
11+
import net.minecraft.util.math.BlockPos;
12+
import net.minecraft.world.World;
13+
import slimeknights.tconstruct.library.traits.AbstractTrait;
14+
15+
public class Gilded extends AbstractTrait {
16+
public static final Gilded gilded = new Gilded();
17+
18+
public Gilded() {
19+
super("gilded",0xFFDD11);
20+
}
21+
22+
@Override
23+
public void afterBlockBreak(ItemStack tool, World world, IBlockState state, BlockPos pos, EntityLivingBase player, boolean wasEffective) {
24+
if (!world.isRemote && state.getBlock().equals(BlocksAether.aether_log) && wasEffective) {
25+
if (state.getValue(PropertyEnum.create("aether_logs", EnumLogType.class)) == EnumLogType.Oak) {
26+
EntityItem amb = new EntityItem(world, pos.getX(), pos.getY(), pos.getZ());
27+
amb.setItem(new ItemStack(ItemsAether.golden_amber, 1 + random.nextInt(2)));
28+
world.spawnEntity(amb);
29+
}
30+
}
31+
}
32+
}

src/main/resources/assets/tinkersaether/lang/en_us.lang

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,11 @@ material.gravitite.name=Gravitite
22
material.zanite.name=Zanite
33
material.skyroot.name=Skyroot
44
material.holystone.name=Holystone
5+
material.goldenamber.name=Golden Amber
6+
material.valkyrie.name=Valkyrie
57

68
fluid.gravitite.name=Molten Gravitite
9+
fluid.valkyrie.name=Molten Valkyrie Metal
710

811
item.dart_shooter.name=Dart Shooter
912
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
2528
modifier.zany.name=Zany
2629
modifier.zany.desc=§oEntropy powered speed.§r\nThe tool mines considerably faster as it wears out.
2730
modifier.zany.extra=Zany Speed: x%s
31+
modifier.gilded.name=Gilded
32+
modifier.gilded.desc=§oShiny sap!§r\nGolden Amber can be harvested from Golden Oak logs.
2833

2934
tinkersaether.config.title=Tinker's Aether Configuration

src/main/resources/mcmod.info

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"modid": "tinkersaether",
44
"name": "Tinker's Aether",
55
"description": "Adds Aether materials and stuff to Tinker's Construct.",
6-
"version": "1.0.2",
6+
"version": "1.0.3",
77
"mcversion": "${mcversion}",
88
"url": "",
99
"updateUrl": "",

0 commit comments

Comments
 (0)