Skip to content

Commit 2d23d42

Browse files
ShnupbupsShnupbups
committed
Version 1.2.0
- Changed Rooted to Skyrooted, fixing compatiblilty with Tinker's Defense. - Added Icestone, with 'Refrigeration' trait, like autosmelt but for the freezer instead of furnace - Added various fletching materials, namely Skyroot Leaf, Golden Oak Leaf, Holiday Leaf, Crystal Leaf and Golden Feather - Made some internal things more consistent - Fixed names of fluids - Added ability to disable melting of Gravitite Ore in the Smeltery, if pack makers want to force use of the Enchanter - Tweaked some colours
1 parent 8e2e80e commit 2d23d42

28 files changed

+250
-70
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.1.6"
14+
version = "1.2.0"
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: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
public class TinkersAether {
3232
public static final String modid = "tinkersaether";
3333
public static final String name = "Tinkers Aether";
34-
public static final String version = "1.1.6";
34+
public static final String version = "1.2.0";
3535

3636
@Mod.Instance(modid)
3737
public static TinkersAether instance;
@@ -69,6 +69,12 @@ public void init(FMLInitializationEvent event) {
6969
if(TAConfig.skyroot) {
7070
MiscUtils.displace(TinkerMaterials.wood.getIdentifier()); // Skyroot needs priority
7171
}
72+
if(TAConfig.skyrootLeaf||TAConfig.goldenOakLeaf||TAConfig.crystalLeaf||TAConfig.holidayLeaf) {
73+
MiscUtils.displace(TinkerMaterials.leaf.getIdentifier()); // Leaves need priority
74+
}
75+
if(TAConfig.goldenFeather) {
76+
MiscUtils.displace(TinkerMaterials.feather.getIdentifier()); // Golden Feather needs priority
77+
}
7278
}
7379

7480
@Mod.EventHandler

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

Lines changed: 32 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ public class TAConfig extends Configuration {
3030

3131
@Config.Comment("Whether Golden Amber is enabled or not.")
3232
@Config.RequiresMcRestart
33-
public static boolean goldenamber = true;
33+
public static boolean goldenAmber = true;
3434

3535
@Config.Comment("Whether Valkyrie Metal is enabled or not.")
3636
@Config.RequiresMcRestart
@@ -42,7 +42,7 @@ public class TAConfig extends Configuration {
4242

4343
@Config.Comment("Whether Candy Cane is enabled or not.")
4444
@Config.RequiresMcRestart
45-
public static boolean candycane = true;
45+
public static boolean candyCane = true;
4646

4747
@Config.Comment("Whether Blue Aercloud is enabled or not.")
4848
@Config.RequiresMcRestart
@@ -56,13 +56,41 @@ public class TAConfig extends Configuration {
5656
@Config.RequiresMcRestart
5757
public static boolean aercloudGold = true;
5858

59+
@Config.Comment("Whether Icestone is enabled or not.")
60+
@Config.RequiresMcRestart
61+
public static boolean icestone = true;
62+
63+
@Config.Comment("Whether Skyroot Leaf is enabled or not.")
64+
@Config.RequiresMcRestart
65+
public static boolean skyrootLeaf = true;
66+
67+
@Config.Comment("Whether Golden Oak Leaf is enabled or not.")
68+
@Config.RequiresMcRestart
69+
public static boolean goldenOakLeaf = true;
70+
71+
@Config.Comment("Whether Holiday Leaf is enabled or not.")
72+
@Config.RequiresMcRestart
73+
public static boolean holidayLeaf = true;
74+
75+
@Config.Comment("Whether Crystal Leaf is enabled or not.")
76+
@Config.RequiresMcRestart
77+
public static boolean crystalLeaf = true;
78+
79+
@Config.Comment("Whether Golden Feather is enabled or not.")
80+
@Config.RequiresMcRestart
81+
public static boolean goldenFeather = true;
82+
5983
@Config.Comment("Whether Darts and Dart Shooters are enabled or not.")
6084
@Config.RequiresMcRestart
6185
public static boolean darts = true;
6286

6387
@Config.Comment("Whether Gravitite can be used to make a tool forge.")
64-
@Config.RequiresMcRestart
65-
public static boolean gravititeForge = true;
88+
@Config.RequiresMcRestart
89+
public static boolean gravititeForge = true;
90+
91+
@Config.Comment("Whether Gravitite Ore can be melted in the smeltery.")
92+
@Config.RequiresMcRestart
93+
public static boolean gravititeOreMelt = true;
6694

6795
@Config.Comment("Whether Valkyrie Metal (if enabled) can be used to make a tool forge.")
6896
@Config.RequiresMcRestart

‎src/main/java/shnupbups/tinkersaether/fluids/FluidHelper.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ public static FluidMolten createFluid(Material material, int temperature) {
1313
fluid.setTemperature(temperature);
1414
FluidRegistry.registerFluid(fluid);
1515
BlockMolten blockFluid = new BlockMolten(fluid);
16-
blockFluid.setUnlocalizedName(TinkersAether.modid+".molten_"+fluid.getName());
17-
blockFluid.setRegistryName(TinkersAether.modid+".molten_"+fluid.getName());
16+
blockFluid.setUnlocalizedName("molten_"+fluid.getName());
17+
blockFluid.setRegistryName("molten_"+fluid.getName());
1818
ForgeRegistries.BLOCKS.register(blockFluid);
1919
FluidRegistry.addBucketForFluid(fluid);
2020
TinkersAether.proxy.registerFluidModels(fluid);

‎src/main/java/shnupbups/tinkersaether/misc/OreDict.java‎

Lines changed: 18 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,21 +7,34 @@
77

88
public class OreDict {
99

10+
private static final int WILDCARD = OreDictionary.WILDCARD_VALUE;
11+
1012
public static void register() {
1113
OreDictionary.registerOre("plankSkyroot", BlocksAether.skyroot_plank);
12-
OreDictionary.registerOre("logSkyroot",BlocksAether.aether_log);
13-
OreDictionary.registerOre("logSkyroot",new ItemStack(BlocksAether.aether_log,1,1));
14+
OreDictionary.registerOre("logSkyroot",new ItemStack(BlocksAether.aether_log,1,WILDCARD));
1415
OreDictionary.registerOre("stickSkyroot", ItemsAether.skyroot_stick);
16+
1517
OreDictionary.registerOre("holystone",BlocksAether.holystone);
18+
OreDictionary.registerOre("icestone",BlocksAether.icestone);
19+
1620
OreDictionary.registerOre("gemGoldenAmber",ItemsAether.golden_amber);
21+
1722
OreDictionary.registerOre("slimeball",ItemsAether.swetty_ball);
1823
OreDictionary.registerOre("slimeballSwet",ItemsAether.swetty_ball);
19-
OreDictionary.registerOre("aercloud",new ItemStack(BlocksAether.aercloud,1,0));
24+
25+
OreDictionary.registerOre("aercloud",new ItemStack(BlocksAether.aercloud,1,WILDCARD));
2026
OreDictionary.registerOre("aercloudCold",new ItemStack(BlocksAether.aercloud,1,0));
21-
OreDictionary.registerOre("aercloud",new ItemStack(BlocksAether.aercloud,1,1));
2227
OreDictionary.registerOre("aercloudBlue",new ItemStack(BlocksAether.aercloud,1,1));
23-
OreDictionary.registerOre("aercloud",new ItemStack(BlocksAether.aercloud,1,2));
2428
OreDictionary.registerOre("aercloudGold",new ItemStack(BlocksAether.aercloud,1,2));
29+
2530
OreDictionary.registerOre("candyCane",ItemsAether.candy_cane);
31+
32+
OreDictionary.registerOre("feather",ItemsAether.golden_feather);
33+
OreDictionary.registerOre("featherGold",ItemsAether.golden_feather);
34+
35+
OreDictionary.registerOre("treeLeavesSkyroot", new ItemStack(BlocksAether.aether_leaves, 1, 0));
36+
OreDictionary.registerOre("treeLeavesGoldenOak", new ItemStack(BlocksAether.aether_leaves, 1, 1));
37+
OreDictionary.registerOre("treeLeavesCrystal", new ItemStack(BlocksAether.crystal_leaves, 1, WILDCARD));
38+
OreDictionary.registerOre("treeLeavesHoliday", new ItemStack(BlocksAether.holiday_leaves, 1, WILDCARD));
2639
}
2740
}

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

Lines changed: 83 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
import shnupbups.tinkersaether.traits.*;
2222
import slimeknights.tconstruct.library.MaterialIntegration;
2323
import slimeknights.tconstruct.library.TinkerRegistry;
24+
import slimeknights.tconstruct.library.events.TinkerRegisterEvent;
2425
import slimeknights.tconstruct.library.materials.*;
2526
import slimeknights.tconstruct.library.smeltery.CastingRecipe;
2627
import slimeknights.tconstruct.tools.TinkerTools;
@@ -38,15 +39,22 @@ public ModuleBase() {
3839

3940
public static final Material skyroot = Materials.mat("skyroot", 0x6C633E);
4041
public static final Material holystone = Materials.mat("holystone", 0xA8AAA8);
41-
public static final Material goldenAmber = Materials.mat("goldenamber", 0xFFE41C);
42+
public static final Material goldenAmber = Materials.mat("golden_amber", 0xFFE41C);
4243
public static final Material zanite = Materials.mat("zanite", 0x6611DD);
4344
public static final Material gravitite = Materials.mat("gravitite", 0xCC55AA);
4445
public static final Material valkyrie = Materials.mat("valkyrie", 0xEEEEDD);
4546
public static final Material swet = Materials.mat("swet", 0x29A6D9);
46-
public static final Material candycane = Materials.mat("candycane", 0xFF3333);
47-
public static final Material aercloudBlue = Materials.mat("aercloudBlue", 0x99B2C2);
48-
public static final Material aercloudCold = Materials.mat("aercloudCold", 0xAAAAAA);
49-
public static final Material aercloudGold = Materials.mat("aercloudGold", 0xFFF1A1);
47+
public static final Material candyCane = Materials.mat("candy_cane", 0xFF3333);
48+
public static final Material aercloudBlue = Materials.mat("aercloud_blue", 0x99B2C2);
49+
public static final Material aercloudCold = Materials.mat("aercloud_cold", 0xAAAAAA);
50+
public static final Material aercloudGold = Materials.mat("aercloud_gold", 0xFFF1A1);
51+
public static final Material icestone = Materials.mat("icestone", 0x99999F);
52+
53+
public static final Material skyrootLeaf = Materials.mat("skyroot_leaf", 0xBFFF5F);
54+
public static final Material goldenOakLeaf = Materials.mat("golden_oak_leaf", 0xEAF84F);
55+
public static final Material crystalLeaf = Materials.mat("crystal_leaf", 0x29AAD9);
56+
public static final Material holidayLeaf = Materials.mat("holiday_leaf", 0xC7A0EB);
57+
public static final Material goldenFeather = Materials.mat("golden_feather", 0xFFF25C);
5058

5159
public static final TAItem valkyrieIngot = new TAItem("valkyrie_ingot").setBeaconPayment();
5260
public static final TAItem valkyrieNugget = new TAItem("valkyrie_nugget");
@@ -68,7 +76,7 @@ public void preInit() {
6876
skyroot.addItem("stickSkyroot", 1, Material.VALUE_Shard);
6977
skyroot.addItem("plankSkyroot", 1, Material.VALUE_Ingot);
7078
skyroot.addItem("logSkyroot", 1, Material.VALUE_Ingot * 4);
71-
skyroot.addTrait(Rooted.rooted, MaterialTypes.HEAD);
79+
skyroot.addTrait(Skyrooted.skyrooted, MaterialTypes.HEAD);
7280
skyroot.addTrait(ecological, MaterialTypes.HEAD);
7381
skyroot.addTrait(ecological);
7482
MaterialIntegration skyrootMi = new MaterialIntegration(skyroot).setRepresentativeItem("plankSkyroot");
@@ -122,7 +130,7 @@ public void preInit() {
122130
TinkerRegistry.integrate(gravititeMi).preInit();
123131
}
124132

125-
if(TAConfig.goldenamber) {
133+
if(TAConfig.goldenAmber) {
126134
TinkerRegistry.addMaterialStats(goldenAmber,
127135
new HeadMaterialStats(300, 1.50f, 7.20f, STONE),
128136
new HandleMaterialStats(0.7f, 40),
@@ -169,18 +177,18 @@ public void preInit() {
169177
TinkerRegistry.integrate(swetMi).preInit();
170178
}
171179

172-
if(TAConfig.candycane) {
173-
TinkerRegistry.addMaterialStats(candycane,
180+
if(TAConfig.candyCane) {
181+
TinkerRegistry.addMaterialStats(candyCane,
174182
new HeadMaterialStats(250, 2.5f, 5.0f, STONE),
175183
new HandleMaterialStats(1.2f, -120),
176184
new ExtraMaterialStats(120),
177185
TinkersAether.plzNo);
178-
candycane.setCraftable(true).setCastable(false);
179-
candycane.addItem("candyCane", 1, Material.VALUE_Ingot);
180-
candycane.addTrait(Festive.festive);
181-
candycane.addTrait(tasty);
182-
MaterialIntegration candycaneMi = new MaterialIntegration(candycane).setRepresentativeItem("candyCane");
183-
TinkerRegistry.integrate(candycaneMi).preInit();
186+
candyCane.setCraftable(true).setCastable(false);
187+
candyCane.addItem("candyCane", 1, Material.VALUE_Ingot);
188+
candyCane.addTrait(Festive.festive);
189+
candyCane.addTrait(tasty);
190+
MaterialIntegration candyCaneMi = new MaterialIntegration(candyCane).setRepresentativeItem("candyCane");
191+
TinkerRegistry.integrate(candyCaneMi).preInit();
184192
}
185193

186194
if(TAConfig.aercloudCold) {
@@ -224,6 +232,59 @@ public void preInit() {
224232
TinkerRegistry.integrate(aercloudGoldMi).preInit();
225233
}
226234

235+
if(TAConfig.icestone) {
236+
TinkerRegistry.addMaterialStats(icestone,
237+
new HeadMaterialStats(250, 4.20f, 3.50f, IRON),
238+
new HandleMaterialStats(0.50f, -20),
239+
new ExtraMaterialStats(40),
240+
TinkersAether.plzNo);
241+
icestone.setCraftable(true).setCastable(false);
242+
icestone.addItem("icestone", 1, Material.VALUE_Ingot);
243+
icestone.addTrait(Refrigeration.refrigeration);
244+
MaterialIntegration icestoneMi = new MaterialIntegration(icestone).setRepresentativeItem("icestone");
245+
TinkerRegistry.integrate(icestoneMi).preInit();
246+
}
247+
248+
if(TAConfig.skyrootLeaf) {
249+
TinkerRegistry.addMaterialStats(skyrootLeaf, new FletchingMaterialStats(0.5f, 1.6f));
250+
skyrootLeaf.setCraftable(true).setCastable(false);
251+
skyrootLeaf.addItem("treeLeavesSkyroot", 1, Material.VALUE_Shard);
252+
MaterialIntegration skyrootLeafMi = new MaterialIntegration(skyrootLeaf).setRepresentativeItem("treeLeavesSkyroot");
253+
TinkerRegistry.integrate(skyrootLeafMi).preInit();
254+
}
255+
256+
if(TAConfig.goldenOakLeaf) {
257+
TinkerRegistry.addMaterialStats(goldenOakLeaf, new FletchingMaterialStats(0.7f, 1.7f));
258+
goldenOakLeaf.setCraftable(true).setCastable(false);
259+
goldenOakLeaf.addItem("treeLeavesGoldenOak", 1, Material.VALUE_Shard);
260+
MaterialIntegration goldenOakLeafMi = new MaterialIntegration(goldenOakLeaf).setRepresentativeItem("treeLeavesGoldenOak");
261+
TinkerRegistry.integrate(goldenOakLeafMi).preInit();
262+
}
263+
264+
if(TAConfig.crystalLeaf) {
265+
TinkerRegistry.addMaterialStats(crystalLeaf, new FletchingMaterialStats(0.8f, 2f));
266+
crystalLeaf.setCraftable(true).setCastable(false);
267+
crystalLeaf.addItem("treeLeavesCrystal", 1, Material.VALUE_Shard);
268+
MaterialIntegration crystalLeafMi = new MaterialIntegration(crystalLeaf).setRepresentativeItem("treeLeavesCrystal");
269+
TinkerRegistry.integrate(crystalLeafMi).preInit();
270+
}
271+
272+
if(TAConfig.holidayLeaf) {
273+
TinkerRegistry.addMaterialStats(holidayLeaf, new FletchingMaterialStats(0.9f, 1.8f));
274+
holidayLeaf.setCraftable(true).setCastable(false);
275+
holidayLeaf.addItem("treeLeavesHoliday", 1, Material.VALUE_Shard);
276+
MaterialIntegration holidayLeafMi = new MaterialIntegration(holidayLeaf).setRepresentativeItem("treeLeavesHoliday");
277+
TinkerRegistry.integrate(holidayLeafMi).preInit();
278+
}
279+
280+
if(TAConfig.goldenFeather) {
281+
TinkerRegistry.addMaterialStats(goldenFeather, new FletchingMaterialStats(1.0f, 2f));
282+
goldenFeather.setCraftable(true).setCastable(false);
283+
goldenFeather.addItem("featherGold", 1, Material.VALUE_Ingot);
284+
MaterialIntegration goldenFeatherMi = new MaterialIntegration(goldenFeather).setRepresentativeItem("featherGold");
285+
TinkerRegistry.integrate(goldenFeatherMi).preInit();
286+
}
287+
227288
TinkersAether.logger.info("Base Module - Materials Registered");
228289

229290
TinkersAether.logger.info("Base Module - End PreInit");
@@ -247,6 +308,13 @@ public void postInit() {
247308
}
248309
}
249310

311+
@SubscribeEvent
312+
public void disableOreSmelting(TinkerRegisterEvent.MeltingRegisterEvent event) {
313+
if(event.getRecipe().input.getInputs().contains(MiscUtils.stackFromOreDict("oreGravitite"))) {
314+
event.setCanceled(!TAConfig.gravititeOreMelt);
315+
}
316+
}
317+
250318
@SubscribeEvent
251319
public void registerRecipes(RegistryEvent.Register<IRecipe> event) {
252320
IForgeRegistry<IRecipe> registry = event.getRegistry();

‎src/main/java/shnupbups/tinkersaether/traits/Antigrav.java‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,19 +2,16 @@
22

33
import com.legacy.aether.entities.block.EntityFloatingBlock;
44
import net.minecraft.item.ItemStack;
5-
import net.minecraft.nbt.NBTTagCompound;
65
import net.minecraft.util.math.BlockPos;
76
import net.minecraft.world.World;
87
import net.minecraftforge.common.ForgeHooks;
98
import net.minecraftforge.common.MinecraftForge;
109
import net.minecraftforge.event.entity.player.PlayerInteractEvent;
1110
import net.minecraftforge.fml.common.eventhandler.EventPriority;
1211
import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
13-
import slimeknights.tconstruct.library.traits.AbstractTrait;
14-
import slimeknights.tconstruct.library.utils.TagUtil;
1512
import slimeknights.tconstruct.library.utils.ToolHelper;
1613

17-
public class Antigrav extends AbstractTrait{
14+
public class Antigrav extends TATrait{
1815
public static final Antigrav antigrav = new Antigrav();
1916

2017
public Antigrav() {
@@ -24,7 +21,6 @@ public Antigrav() {
2421

2522
@SubscribeEvent(priority = EventPriority.LOWEST)
2623
public void floatBlock(PlayerInteractEvent.RightClickBlock event) {
27-
NBTTagCompound nbt = TagUtil.getTagSafe(event.getItemStack());
2824
World world = event.getWorld();
2925
BlockPos pos = event.getPos();
3026
ItemStack heldItem = event.getItemStack();
@@ -34,7 +30,6 @@ public void floatBlock(PlayerInteractEvent.RightClickBlock event) {
3430
|| !isToolWithTrait(heldItem)
3531
|| ToolHelper.getCurrentDurability(event.getItemStack()) < 4)
3632
return;
37-
EntityFloatingBlock entity = new EntityFloatingBlock(world, pos, world.getBlockState(pos));
3833
if ((heldItem.getDestroySpeed(world.getBlockState(pos)) > 1.0f || ForgeHooks.isToolEffective(world, pos, heldItem)) && world.isAirBlock(pos.up())) {
3934
if (world.getTileEntity(pos) != null || world.getBlockState(pos).getBlockHardness(world, pos) == -1.0F) {
4035
return;

‎src/main/java/shnupbups/tinkersaether/traits/Cushy.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,9 @@
44
import net.minecraft.init.Enchantments;
55
import net.minecraft.item.ItemStack;
66
import net.minecraft.nbt.NBTTagCompound;
7-
import slimeknights.tconstruct.library.traits.AbstractTrait;
87
import slimeknights.tconstruct.library.utils.ToolBuilder;
98

10-
public class Cushy extends AbstractTrait {
9+
public class Cushy extends TATrait {
1110
public static final Cushy cushy = new Cushy();
1211

1312
public Cushy() {

‎src/main/java/shnupbups/tinkersaether/traits/Enlightened.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,8 @@
77
import net.minecraft.item.ItemStack;
88
import net.minecraft.util.math.BlockPos;
99
import net.minecraft.world.World;
10-
import slimeknights.tconstruct.library.traits.AbstractTrait;
1110

12-
public class Enlightened extends AbstractTrait {
11+
public class Enlightened extends TATrait {
1312
public static final Enlightened enlightened = new Enlightened();
1413

1514
public Enlightened() {

‎src/main/java/shnupbups/tinkersaether/traits/Festive.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,8 @@
77
import net.minecraft.item.ItemStack;
88
import net.minecraft.util.math.BlockPos;
99
import net.minecraft.world.World;
10-
import slimeknights.tconstruct.library.traits.AbstractTrait;
1110

12-
public class Festive extends AbstractTrait {
11+
public class Festive extends TATrait {
1312
public static final Festive festive = new Festive();
1413

1514
public Festive() {

0 commit comments

Comments
 (0)