diff options
author | Connor-Colenso <52056774+Connor-Colenso@users.noreply.github.com> | 2023-10-18 17:03:23 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-10-18 18:03:23 +0200 |
commit | fbdbb388c369fae549cfde3eed38b536f7461d90 (patch) | |
tree | b46f7fc949d7e4c6e3be910b81ed725e6dc1648e /src/main/java/gtPlusPlus/xmod/tinkers/material | |
parent | b670446fdf49991093b485f0aa14050039632775 (diff) | |
download | GT5-Unofficial-fbdbb388c369fae549cfde3eed38b536f7461d90.tar.gz GT5-Unofficial-fbdbb388c369fae549cfde3eed38b536f7461d90.tar.bz2 GT5-Unofficial-fbdbb388c369fae549cfde3eed38b536f7461d90.zip |
Cleaning up (#767)
* Kill playerAPI
* Gut more events and compat that is now obsolete
* Remove commented out code
* Remove final modifier from methods
* Make more stuff final
* Remove slow building ring
* Protected -> private in final classes
* More cleaning
* More cleaning v2
* Purging
* Clean DevHelper
* Clean DevHelper 2
* delete DevHelper
* remove useless IFMLLoadingPlugin.MCVersion annotation from @Mod files
* check for obfuscation only once in the IFMLloadingPlugin.injectData
* don't instantiate the static class ASMConfig
* delete unused and empty implementation of IFMLCallHook
* delete empty class
* delete ClassesToTransform class that just holds the class names constants
* delete unused methods and unsless logging in dummymod container
* delete unused transformer ClassTransformer_TT_ThaumicRestorer
* spotless
* Clean
* Clean utils
* Build checkpoint
* Purge
* Stage 2
* Stage 3
* Stage 4
* Stage 5
* Stage 6
* Spotless
* Imports
* Stage idk
* Stage 1
* Fix issue
* Spotless
* Format numbers
---------
Co-authored-by: GTNH-Colen <54497873+GTNH-Colen@users.noreply.github.com>
Co-authored-by: Alexdoru <57050655+Alexdoru@users.noreply.github.com>
Co-authored-by: Connor Colenso <colen@CONNORSPC>
Diffstat (limited to 'src/main/java/gtPlusPlus/xmod/tinkers/material')
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/tinkers/material/BaseTinkersMaterial.java | 45 |
1 files changed, 3 insertions, 42 deletions
diff --git a/src/main/java/gtPlusPlus/xmod/tinkers/material/BaseTinkersMaterial.java b/src/main/java/gtPlusPlus/xmod/tinkers/material/BaseTinkersMaterial.java index 06f7ad47f5..8133b1f78d 100644 --- a/src/main/java/gtPlusPlus/xmod/tinkers/material/BaseTinkersMaterial.java +++ b/src/main/java/gtPlusPlus/xmod/tinkers/material/BaseTinkersMaterial.java @@ -20,7 +20,7 @@ import gtPlusPlus.xmod.tinkers.util.TinkersUtils; public class BaseTinkersMaterial { - private static HashMap<String, Integer> aInternalMaterialIdMap = new HashMap<String, Integer>(); + private static HashMap<String, Integer> aInternalMaterialIdMap = new HashMap<>(); private static int aNextFreeID; public final String mLocalName; @@ -88,7 +88,7 @@ public class BaseTinkersMaterial { } private static String calcStyle(Material aMaterial) { - String aReturn = "" + EnumChatFormatting.WHITE; + String aReturn; int aTemp = aMaterial.getMeltingPointC(); if (aTemp < 3600) { aReturn = "" + EnumChatFormatting.WHITE; @@ -110,46 +110,12 @@ public class BaseTinkersMaterial { return aMaterial.getRgbAsHex(); } - public Object generateToolMaterial(Material aMaterial) { - int level, dura, speed, dmg, reinf, primColour; - float handle, stonebound; - level = calcHarvestLevel(aMaterial); - dura = calcDurability(aMaterial); - speed = calcMiningSpeed(aMaterial); - dmg = calcAttack(aMaterial); - reinf = calcReinforced(aMaterial); - primColour = calcColour(aMaterial); - handle = calcHandleModifier(aMaterial); - // stonebound = calcHarvestLevel(aMaterial); - stonebound = 0; - return TinkersUtils.generateToolMaterial( - aMaterial.getLocalizedName(), - aMaterial.getUnlocalizedName(), - level, - dura, - speed, - dmg, - handle, - reinf, - stonebound, - calcStyle(aMaterial), - primColour); - } - public void generate() { Logger.INFO("[TiCon] Trying to generate Material: " + mLocalName); int id = mID; if (id > 0) { - // Object aTinkersCustomMaterial = generateToolMaterial(mMaterial); - // Logger.INFO("[TiCon] Created Material: "+mLocalName); - - // TinkersUtils.addToolMaterial(id, aTinkersCustomMaterial); - // TinkersUtils.addDefaultToolPartMaterial(id); - // TinkersUtils.addBowMaterial(id, calcBowDrawSpeed(mMaterial), 1.0F); - // TinkersUtils.addArrowMaterial(id, calcProjectileMass(mMaterial), calcProjectileFragility(mMaterial)); - NBTTagCompound tag = new NBTTagCompound(); tag.setInteger("Id", id); tag.setString("Name", mUnlocalName); @@ -215,8 +181,6 @@ public class BaseTinkersMaterial { return false; } - // Smeltery.addMelting(new ItemStack(ExtraUtils.unstableIngot, 1, 0), ExtraUtils.decorative1, 5, 850, - // aMaterial.getFluid(72)); TinkersUtils.registerFluidType(mLocalName, aMatBlock, 0, aMelt, aFluid, true); TinkersUtils.addMelting(aMaterial.getBlock(1), aMatBlock, 0, aMelt, aMaterial.getFluidStack(144 * 9)); TinkersUtils.addMelting(aMaterial.getIngot(1), aMatBlock, 0, aMelt, aMaterial.getFluidStack(144)); @@ -232,10 +196,7 @@ public class BaseTinkersMaterial { .addCastingTableRecipe(aMaterial.getIngot(1), aMaterial.getFluidStack(144), ingotcast, false, 50); } - boolean extended = TinkersUtils.generateCastingRecipes(aMaterial, aID); - - // TConstructRegistry.getBasinCasting().addCastingRecipe(new ItemStack(ExtraUtils.decorative1, 1, 5), new - // FluidStack(unstable, 1296), (ItemStack)null, true, 100); + TinkersUtils.generateCastingRecipes(aMaterial, aID); return true; } |