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.

Sign up for GitHub

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

Jump to bottom

Remove some GT tools #3203

Open
wants to merge 20 commits into
base: master
Choose a base branch
from
Open

Remove some GT tools #3203

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
f089a67
Getting there
GTNH-Colen Sep 12, 2024
bbdd86f
Loads into dev
GTNH-Colen Sep 12, 2024
da6742f
Fix
GTNH-Colen Sep 12, 2024
e2874d5
Getting there
GTNH-Colen Sep 12, 2024
7efade9
Loads into dev
GTNH-Colen Sep 12, 2024
28a6e9f
Delete useless GT tools creative tab
GTNH-Colen Sep 14, 2024
c667a5c
t
GTNH-Colen Sep 14, 2024
fc20128
Merge remote-tracking branch 'origin/removeTools' into removeTools
GTNH-Colen Sep 15, 2024
d0f6917
Initial flint tools added
GTNH-Colen Sep 15, 2024
f57e468
Temp textures working
GTNH-Colen Sep 15, 2024
cc2adc2
Temp textures working
GTNH-Colen Sep 15, 2024
14ad6a4
Move registration and material
GTNH-Colen Sep 15, 2024
0e27420
Postea conversions in place
GTNH-Colen Sep 15, 2024
c48b0ed
Recipes + default enchantment working
GTNH-Colen Sep 15, 2024
eeb62a8
Refactor a little and apply fire aspect to transformed axe/sword.
GTNH-Colen Sep 15, 2024
2b52c47
Make textures darker
GTNH-Colen Sep 15, 2024
c466b64
Merge branch 'master' into removeTools
GTNH-Colen Sep 15, 2024
43c3092
Spotless apply for branch removeTools for #3203 (#3204)
github-actions[bot] Sep 16, 2024
69df275
Merge branch 'master' into removeTools
Dream-Master Sep 21, 2024
d9a70e9
Merge branch 'master' into removeTools
Dream-Master Sep 24, 2024
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
2 changes: 1 addition & 1 deletion src/main/java/detrav/items/processing/ProcessingDetravToolProspector.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
public class ProcessingDetravToolProspector implements gregtech.api.interfaces.IOreRecipeRegistrator {

public ProcessingDetravToolProspector() {
OrePrefixes.toolHeadPickaxe.add(this);

}

public void registerOre(OrePrefixes aPrefix, Materials material, String aOreDictName, String aModName,
Expand Down
8 changes: 6 additions & 2 deletions src/main/java/gregtech/GTMod.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,7 @@
import gregtech.common.config.Other;
import gregtech.common.config.Worldgen;
import gregtech.common.covers.CoverFacadeAE;
import gregtech.common.items.flinttools.FlintTools;
import gregtech.common.misc.GTCommand;
import gregtech.common.misc.spaceprojects.commands.SPCommand;
import gregtech.common.misc.spaceprojects.commands.SPMCommand;
Expand Down Expand Up @@ -328,6 +329,11 @@ public void onPreLoad(FMLPreInitializationEvent aEvent) {
if (FMLCommonHandler.instance()
.getEffectiveSide()
.isServer()) AssemblyLineServer.fillMap(aEvent);

// Flint tool setup.
FlintTools.registerTools();
FlintTools.registerPosteaTransformations();
FlintTools.registerRecipes();
}

@Mod.EventHandler
Expand Down Expand Up @@ -589,8 +595,6 @@ public void onPostLoad(FMLPostInitializationEvent aEvent) {
GregTechAPI.sAfterGTLoad = null;
GregTechAPI.sBeforeGTPostload = null;
GregTechAPI.sAfterGTPostload = null;

GTPostLoad.createGTtoolsCreativeTab();
}

@Mod.EventHandler
Expand Down
32 changes: 0 additions & 32 deletions src/main/java/gregtech/api/enums/OrePrefixes.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -241,35 +241,11 @@ public enum OrePrefixes {
bulletGtLarge("Large Bullets", "Large ", " Bullet", true, true, false, false, true, false, true, false, true, false,
B[6] | B[8], M / 3, 64, -1),
/** consisting out of 2 Ingots. */
toolHeadSword("Sword Blades", "", " Sword Blade", true, true, false, false, false, false, true, true, false, false,
B[6], M * 2, 64, 32),
/** consisting out of 3 Ingots. */
toolHeadPickaxe("Pickaxe Heads", "", " Pickaxe Head", true, true, false, false, false, false, true, true, false,
false, B[6], M * 3, 64, 33),
/** consisting out of 1 Ingots. */
toolHeadShovel("Shovel Heads", "", " Shovel Head", true, true, false, false, false, false, true, true, false, false,
B[6], M * 1, 64, 34),
/** consisting out of 1 Ingots. */
toolHeadUniversalSpade("Universal Spade Heads", "", " Universal Spade Head", true, true, false, false, false, false,
true, true, false, false, B[6], M * 1, 64, 43),
/** consisting out of 3 Ingots. */
toolHeadAxe("Axe Heads", "", " Axe Head", true, true, false, false, false, false, true, true, false, false, B[6],
M * 3, 64, 35),
/** consisting out of 2 Ingots. */
toolHeadHoe("Hoe Heads", "", " Hoe Head", true, true, false, false, false, false, true, true, false, false, B[6],
M * 2, 64, 36),
/** consisting out of 3 Ingots. */
toolHeadSense("Sense Blades", "", " Sense Blade", true, true, false, false, false, false, true, true, false, false,
B[6], M * 3, 64, 44),
/** consisting out of 2 Ingots. */
toolHeadFile("File Heads", "", " File Head", true, true, false, false, false, false, true, true, false, false, B[6],
M * 2, 64, 38),
/** consisting out of 6 Ingots. */
toolHeadHammer("Hammer Heads", "", " Hammer Head", true, true, false, false, false, false, true, true, false, false,
B[6], M * 6, 64, 37),
/** consisting out of 4 Ingots. */
toolHeadPlow("Plow Heads", "", " Plow Head", true, true, false, false, false, false, true, true, false, false, B[6],
M * 4, 64, 45),
/** consisting out of 2 Ingots. */
toolHeadSaw("Saw Blades", "", " Saw Blade", true, true, false, false, false, false, true, true, false, false, B[6],
M * 2, 64, 39),
Expand Down Expand Up @@ -1090,20 +1066,12 @@ public enum OrePrefixes {
OrePrefixes.screw,
OrePrefixes.ring,
OrePrefixes.foil,
OrePrefixes.toolHeadSword,
OrePrefixes.toolHeadPickaxe,
OrePrefixes.toolHeadShovel,
OrePrefixes.toolHeadAxe,
OrePrefixes.toolHeadHoe,
OrePrefixes.toolHeadHammer,
OrePrefixes.toolHeadFile,
OrePrefixes.toolHeadSaw,
OrePrefixes.toolHeadDrill,
OrePrefixes.toolHeadChainsaw,
OrePrefixes.toolHeadWrench,
OrePrefixes.toolHeadUniversalSpade,
OrePrefixes.toolHeadSense,
OrePrefixes.toolHeadPlow,
OrePrefixes.toolHeadBuzzSaw,
OrePrefixes.turbineBlade,
OrePrefixes.wireFine,
Expand Down
24 changes: 12 additions & 12 deletions src/main/java/gregtech/api/enums/TextureSet.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,20 +34,20 @@ public class TextureSet {
"/dustPure", "/crushed", "/crushedPurified", "/crushedCentrifuged", "/gem", "/nugget", "/casingSmall", "/ingot",
"/ingotHot", "/ingotDouble", "/ingotTriple", "/ingotQuadruple", "/ingotQuintuple", "/plate", "/plateDouble",
"/plateTriple", "/plateQuadruple", "/plateQuintuple", "/plateDense", "/stick", "/lens", "/round", "/bolt",
"/screw", "/ring", "/foil", "/cell", "/cellPlasma", "/toolHeadSword", "/toolHeadPickaxe", "/toolHeadShovel",
"/toolHeadAxe", "/toolHeadHoe", "/toolHeadHammer", "/toolHeadFile", "/toolHeadSaw", "/toolHeadDrill",
"/toolHeadChainsaw", "/toolHeadWrench", "/toolHeadUniversalSpade", "/toolHeadSense", "/toolHeadPlow",
"/toolHeadArrow", "/toolHeadScrewdriver", "/toolHeadBuzzSaw", "/toolHeadSoldering", "/nanites", "/wireFine",
"/gearGtSmall", "/rotor", "/stickLong", "/springSmall", "/spring", "/arrowGtWood", "/arrowGtPlastic",
"/gemChipped", "/gemFlawed", "/gemFlawless", "/gemExquisite", "/gearGt", "/oreRaw", aTextVoidDir, aTextVoidDir,
"/oreSmall", "/ore", "/wire", "/foil", "/block1", "/block2", "/block3", "/block4", "/block5", "/block6",
"/pipeSide", "/pipeTiny", "/pipeSmall", "/pipeMedium", "/pipeLarge", "/pipeHuge", "/frameGt", "/pipeQuadruple",
"/pipeNonuple", aTextVoidDir, aTextVoidDir, aTextVoidDir, aTextVoidDir, aTextVoidDir, aTextVoidDir,
aTextVoidDir, aTextVoidDir, aTextVoidDir, aTextVoidDir, "/crateGtDust", "/crateGtIngot", "/crateGtGem",
"/crateGtPlate", "/turbineBlade", aTextVoidDir, aTextVoidDir, aTextVoidDir, aTextVoidDir, aTextVoidDir,
"/screw", "/ring", "/foil", "/cell", "/cellPlasma", aTextVoidDir, aTextVoidDir, aTextVoidDir, aTextVoidDir,
aTextVoidDir, "/toolHeadHammer", "/toolHeadFile", "/toolHeadSaw", "/toolHeadDrill", "/toolHeadChainsaw",
"/toolHeadWrench", aTextVoidDir, aTextVoidDir, aTextVoidDir, aTextVoidDir, "/toolHeadScrewdriver",
"/toolHeadBuzzSaw", "/toolHeadSoldering", "/nanites", "/wireFine", "/gearGtSmall", "/rotor", "/stickLong",
"/springSmall", "/spring", "/arrowGtWood", "/arrowGtPlastic", "/gemChipped", "/gemFlawed", "/gemFlawless",
"/gemExquisite", "/gearGt", "/oreRaw", aTextVoidDir, aTextVoidDir, "/oreSmall", "/ore", "/wire", "/foil",
"/block1", "/block2", "/block3", "/block4", "/block5", "/block6", "/pipeSide", "/pipeTiny", "/pipeSmall",
"/pipeMedium", "/pipeLarge", "/pipeHuge", "/frameGt", "/pipeQuadruple", "/pipeNonuple", aTextVoidDir,
aTextVoidDir, aTextVoidDir, aTextVoidDir, aTextVoidDir, aTextVoidDir, aTextVoidDir, aTextVoidDir, aTextVoidDir,
aTextVoidDir, "/crateGtDust", "/crateGtIngot", "/crateGtGem", "/crateGtPlate", "/turbineBlade", aTextVoidDir,
aTextVoidDir, aTextVoidDir, aTextVoidDir, aTextVoidDir, aTextVoidDir, aTextVoidDir, aTextVoidDir, aTextVoidDir,
aTextVoidDir, aTextVoidDir, aTextVoidDir, "/plateSuperdense", "/handleMallet", "/toolHeadMallet", };
aTextVoidDir, aTextVoidDir, aTextVoidDir, aTextVoidDir, aTextVoidDir, aTextVoidDir, aTextVoidDir, aTextVoidDir,
aTextVoidDir, aTextVoidDir, aTextVoidDir, aTextVoidDir, aTextVoidDir, aTextVoidDir, aTextVoidDir,
"/plateSuperdense", "/handleMallet", "/toolHeadMallet", };

public boolean is_custom = false;

Expand Down
24 changes: 0 additions & 24 deletions src/main/java/gregtech/common/GTProxy.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,6 @@
import net.minecraft.util.ResourceLocation;
import net.minecraft.world.ChunkCoordIntPair;
import net.minecraft.world.World;
import net.minecraft.world.WorldSettings.GameType;
import net.minecraft.world.gen.feature.WorldGenMinable;
import net.minecraftforge.common.MinecraftForge;
import net.minecraftforge.event.ForgeEventFactory;
Expand Down Expand Up @@ -161,9 +160,7 @@
import gregtech.api.util.GTUtility;
import gregtech.api.util.WorldSpawnedEventBuilder;
import gregtech.common.config.OPStuff;
import gregtech.common.items.IDMetaTool01;
import gregtech.common.items.MetaGeneratedItem98;
import gregtech.common.items.MetaGeneratedTool01;
import gregtech.common.misc.GlobalEnergyWorldSavedData;
import gregtech.common.misc.GlobalMetricsCoverDatabase;
import gregtech.common.misc.spaceprojects.SpaceProjectWorldSavedData;
Expand Down Expand Up @@ -2289,27 +2286,6 @@ public void onPlayerTickEventServer(TickEvent.PlayerTickEvent aEvent) {
return;
}

if ((aEvent.player.ticksExisted % 200 == 0) && (aEvent.player.capabilities.allowEdit)
&& (!aEvent.player.capabilities.isCreativeMode)
&& (this.mSurvivalIntoAdventure)) {
aEvent.player.setGameType(GameType.ADVENTURE);
aEvent.player.capabilities.allowEdit = false;
if (this.mAxeWhenAdventure) {
GTUtility.sendChatToPlayer(
aEvent.player,
GTLanguageManager.addStringLocalization(
"Interaction_DESCRIPTION_Index_097",
"It's dangerous to go alone! Take this."));
aEvent.player.worldObj.spawnEntityInWorld(
new EntityItem(
aEvent.player.worldObj,
aEvent.player.posX,
aEvent.player.posY,
aEvent.player.posZ,
MetaGeneratedTool01.INSTANCE
.getToolWithStats(IDMetaTool01.AXE.ID, 1, Materials.Flint, Materials.Wood, null)));
}
}
final boolean tHungerEffect = (this.mHungerEffect) && (aEvent.player.ticksExisted % 2400 == 1200);

if (aEvent.player.ticksExisted % 120 != 0) {
Expand Down
9 changes: 0 additions & 9 deletions src/main/java/gregtech/common/items/IDMetaTool01.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,6 @@
public enum IDMetaTool01 {

// Please pretty please, add your entries while conserving the order
SWORD(0),
PICKAXE(2),
SHOVEL(4),
AXE(6),
HOE(8),
SAW(10),
HARDHAMMER(12),
SOFTMALLET(14),
Expand All @@ -24,10 +19,6 @@ public enum IDMetaTool01 {
UNIVERSALSPADE(32),
KNIFE(34),
BUTCHERYKNIFE(36),
@Deprecated
SICKLE(38),
SENSE(40),
PLOW(42),
PLUNGER(44),
ROLLING_PIN(46),
DRILL_LV(100),
Expand Down
8 changes: 0 additions & 8 deletions src/main/java/gregtech/common/items/MetaGeneratedItem02.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -261,20 +261,12 @@ public class MetaGeneratedItem02 extends MetaGeneratedItemX32 {
public MetaGeneratedItem02() {
super(
"metaitem.02",
OrePrefixes.toolHeadSword,
OrePrefixes.toolHeadPickaxe,
OrePrefixes.toolHeadShovel,
OrePrefixes.toolHeadAxe,
OrePrefixes.toolHeadHoe,
OrePrefixes.toolHeadHammer,
OrePrefixes.toolHeadFile,
OrePrefixes.toolHeadSaw,
OrePrefixes.toolHeadDrill,
OrePrefixes.toolHeadChainsaw,
OrePrefixes.toolHeadWrench,
OrePrefixes.toolHeadUniversalSpade,
OrePrefixes.toolHeadSense,
OrePrefixes.toolHeadPlow,
OrePrefixes.___placeholder___,
OrePrefixes.toolHeadBuzzSaw,
OrePrefixes.turbineBlade,
Expand Down
Loading
Loading