Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove Teflon #3801

Merged
merged 2 commits into from
Jan 13, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions src/main/java/goodgenerator/loader/RecipeLoader2.java
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,6 @@
import gregtech.api.util.GTRecipe;
import gregtech.api.util.GTUtility;
import gregtech.api.util.recipe.Scanning;
import gtPlusPlus.core.item.chemistry.GenericChem;
import gtPlusPlus.core.material.MaterialsAlloy;
import gtPlusPlus.core.material.MaterialsElements;
import gtPlusPlus.core.recipe.common.CI;
Expand Down Expand Up @@ -1556,8 +1555,8 @@ public static void RecipeLoad() {
MaterialsAlloy.TITANSTEEL.getPlateDense(8), ItemRefer.HiC_T4.get(8),
ItemList.Field_Generator_UHV.get(8),
GGMaterial.enrichedNaquadahAlloy.get(OrePrefixes.gearGtSmall, 64) },
new FluidStack[] { GenericChem.TEFLON.getFluidStack(2304), GGMaterial.dalisenite.getMolten(1152),
MaterialsAlloy.BOTMIUM.getFluidStack(288) },
new FluidStack[] { MaterialsElements.STANDALONE.RHUGNOR.getFluidStack(144),
GGMaterial.dalisenite.getMolten(1152), MaterialsAlloy.BOTMIUM.getFluidStack(288) },
ItemRefer.Compact_Fusion_MK4.get(1),
6000,
(int) TierEU.RECIPE_UV);
Expand Down
30 changes: 0 additions & 30 deletions src/main/java/gtPlusPlus/core/item/chemistry/GenericChem.java
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@
import gregtech.api.enums.ItemList;
import gregtech.api.enums.Materials;
import gregtech.api.enums.OrePrefixes;
import gregtech.api.enums.TextureSet;
import gregtech.api.enums.TierEU;
import gregtech.api.util.GTModHandler;
import gregtech.api.util.GTOreDictUnificator;
Expand All @@ -30,13 +29,8 @@
import gtPlusPlus.api.objects.minecraft.ItemPackage;
import gtPlusPlus.core.item.chemistry.general.ItemGenericChemBase;
import gtPlusPlus.core.item.circuit.GTPPIntegratedCircuitItem;
import gtPlusPlus.core.material.Material;
import gtPlusPlus.core.material.MaterialGenerator;
import gtPlusPlus.core.material.MaterialMisc;
import gtPlusPlus.core.material.MaterialStack;
import gtPlusPlus.core.material.MaterialsElements;
import gtPlusPlus.core.material.MaterialsOther;
import gtPlusPlus.core.material.state.MaterialState;
import gtPlusPlus.core.recipe.common.CI;
import gtPlusPlus.core.util.minecraft.FluidUtils;
import gtPlusPlus.core.util.minecraft.ItemUtils;
Expand All @@ -45,28 +39,6 @@

public class GenericChem extends ItemPackage {

/**
* Materials
*/

// Refined PTFE
public static final Material TEFLON = new Material(
"Teflon",
MaterialState.SOLID,
TextureSet.SET_SHINY,
new short[] { 75, 45, 75 },
330,
640,
-1,
-1,
false,
null,
0,
new MaterialStack(MaterialsOther.PTFE, 75),
new MaterialStack(MaterialsOther.PLASTIC, 15),
new MaterialStack(MaterialsElements.getInstance().CARBON, 5),
new MaterialStack(MaterialsElements.getInstance().SODIUM, 5));

/**
* Fluids
*/
Expand Down Expand Up @@ -140,8 +112,6 @@ public class GenericChem extends ItemPackage {
@Override
public void items() {

MaterialGenerator.generate(TEFLON, false);

mGenericChemItem1 = new ItemGenericChemBase();
mAdvancedCircuit = new GTPPIntegratedCircuitItem("T3RecipeSelector", "science/general/AdvancedCircuit");
GregtechItemList.Circuit_T3RecipeSelector.set(mAdvancedCircuit);
Expand Down
10 changes: 0 additions & 10 deletions src/main/resources/assets/miscutils/lang/en_US.lang
Original file line number Diff line number Diff line change
Expand Up @@ -2215,7 +2215,6 @@ block.Tantalloy61.frame.name=Tantalloy-61 Frame Box
block.Tantalloy61.standard.name=Block of Tantalloy-61
block.TantalumCarbide.frame.name=Tantalum Carbide Frame Box
block.TantalumCarbide.standard.name=Block of Tantalum Carbide
block.Teflon.standard.name=Block of Teflon
block.Thallium.frame.name=Thallium Frame Box
block.Thallium.standard.name=Block of Thallium
block.Titansteel.frame.name=Titansteel Frame Box
Expand Down Expand Up @@ -3104,15 +3103,6 @@ item.itemPlateNylon.name=Nylon Plate
item.itemPlateDoubleNylon.name=Double Nylon Plate
item.itemCellNylon.name=Nylon Cell
tile.Block of Nylon.name=Block of Nylon
item.itemIngotTeflon.name=Teflon Ingot
item.itemDustTeflon.name=Teflon Dust
item.itemDustTinyTeflon.name=Tiny Pile of Teflon Dust
item.itemDustSmallTeflon.name=Small Pile of Teflon Dust
item.itemNuggetTeflon.name=Teflon Nugget
item.itemPlateTeflon.name=Teflon Plate
item.itemPlateDoubleTeflon.name=Double Teflon Plate
item.itemCellTeflon.name=Teflon Cell
tile.Block of Teflon.name=Block of Teflon

# Added 17/4/19
# Spelling Corrections
Expand Down
9 changes: 0 additions & 9 deletions src/main/resources/assets/miscutils/lang/ru_RU.lang
Original file line number Diff line number Diff line change
Expand Up @@ -2745,15 +2745,6 @@ item.itemPlateNylon.name=Nylon Plate
item.itemPlateDoubleNylon.name=Double Nylon Plate
item.itemCellNylon.name=Nylon Cell
tile.Block of Nylon.name=Block of Nylon
item.itemIngotTeflon.name=Teflon Ingot
item.itemDustTeflon.name=Teflon Dust
item.itemDustTinyTeflon.name=Tiny Pile of Teflon Dust
item.itemDustSmallTeflon.name=Small Pile of Teflon Dust
item.itemNuggetTeflon.name=Teflon Nugget
item.itemPlateTeflon.name=Teflon Plate
item.itemPlateDoubleTeflon.name=Double Teflon Plate
item.itemCellTeflon.name=Teflon Cell
tile.Block of Teflon.name=Block of Teflon

//Added 17/4/19
//Spelling Corrections
Expand Down
9 changes: 0 additions & 9 deletions src/main/resources/assets/miscutils/lang/zh_CN.lang
Original file line number Diff line number Diff line change
Expand Up @@ -2745,15 +2745,6 @@ item.itemPlateNylon.name=尼龙板
item.itemPlateDoubleNylon.name=双重尼龙板
item.itemCellNylon.name=尼龙单元
tile.Block of Nylon.name=尼龙块
item.itemIngotTeflon.name=特氟龙锭
item.itemDustTeflon.name=特氟龙粉
item.itemDustTinyTeflon.name=小撮特氟龙粉
item.itemDustSmallTeflon.name=小堆特氟龙粉
item.itemNuggetTeflon.name=特氟龙粒
item.itemPlateTeflon.name=特氟龙板
item.itemPlateDoubleTeflon.name=双重特氟龙板
item.itemCellTeflon.name=特氟龙单元
tile.Block of Teflon.name=特氟龙块

//Added 17/4/19
//Spelling Corrections
Expand Down
Loading