Skip to content
This repository has been archived by the owner on May 26, 2024. It is now read-only.

Commit

Permalink
Clean-up v2 (#729)
Browse files Browse the repository at this point in the history
* Remove test items from NEI with no texture

* Add number formatting to hand pumps

* Remove heavy plates (no recipes & completely unused).

* Remove helium generator (no texture, no recipe)

* Remove fire pit and fire starter (no use, no recipe, no textures)

* Remove giant chicken and associated unused stuff, has no texture and is unobtainable. Used to be relevant but isn't anymore.

* Remove villagers with silly trades like 1 motor + 1 hull = 1 hull. Why?

* Remove trade bench, no recipe, missing textures. Unused.

* Remove farm processors, no texture, no recipe. Unused.

* Remove MAX tier components, these exist in GT now, have no recipe here and are unused.

* Hide untextured light block from NEI

* Update buildscript

* Remove unused backpacks, no recipe and contains dupe bugs. Bad.

* Remove eatotronic, universal toolbox and magic tool bag. All 3 are missing textures and uncraftable.

* Remove eatotronic, universal toolbox and magic tool bag. All 3 are missing textures and uncraftable. part 2

* Remove dragon catcher (what?), no texture, no recipe, unused.

* Remove empty item, does nothing, has no recipe, no idea why it is here.

* Empty item v2 removal

* Revert "Empty item v2 removal"

This reverts commit 75bcd3c.

* Revert "Remove empty item, does nothing, has no recipe, no idea why it is here."

This reverts commit e41a9f4.

* Remove debug square. No recipe, unused.

* Number formatting overflow covers

* Remove JVM garbage collection block. Unused, no recipe.

* Remove nanotubes, no recipe for them. Unused.

* Remove "git" item, doesn't seem to work. Has no recipe.

* Remove uncraftable food with awful textures.

* Remove "bat king" mob, unused content. Does not spawn.

* Remove uncraftable doors with bad textures. Unused content.

* Remove uncraftable, unlocalised redstone stuff that crashes game when placed.

* Remove weird spawner item. No recipe, does not exist in world.

* Remove sunnarium bit, no recipe, no usage.

* Remove unused modularity table and some misc uncraftable, unused items.

* Remove Interconnecting Storage Crate, no recipe, unused.

* Delete worse debug power gen, this already exists as part of GT. Unneeded duplication.

* Delete unused placeholder circuit

* Delete uncraftable generator hatches.

* Spotless

* Remove XP tank thing, unused and uncraftable.

* Remove null item, this fluid registry only seemed to register one null fluid. All others exist?

* Remove EU -> RF battery. Unused in GTNH.

* Remove some shelf nonsense, why is this in this mod?

* Remove some weird random tools. These have no realistic usage in GTNH.

* Remove firemaker. Useless in GTNH.

* Removed helium blob. Deprecated item, not used anymore, uncraftable.

* spotlessApply (#730)

Co-authored-by: GitHub GTNH Actions <>

* Stop modulators generating unused blocks with no textures

* Remove more unused untextured casings

* Remove more unused untextured casings

* Remove more unused untextured casings

* Remove more unused untextured casings

* Remove more unused untextured casings

* Remove some weird methods and uncraftable mining parts, probably part of deprecated multiblock.

* spotlessApply (#732)

Co-authored-by: GitHub GTNH Actions <>

* Remove gem shards, unused.

* Remove unused atoms

* Remove unused gum

* Remove unused elements/materials

* Bye bye

* Remove some unused reflection stuff

* Remove control cores, obsolete now.

* Remove mob killing thing with no texture and no recipe.

* Remove uncraftable covers

* Remove pizza gloves

* Net and rope removal, unused

* Remove force crop

* Removal of some old event stuff

* Remove unused nuclear chem items

* Remove player safe, mostly because of the horrible event code that was intercepting every block break. I can't see any real usage of this via discord.

* Remove Force material and associated other nonsense. Also remove some nuclear chem stuff.

* Remove force for realsies

* Skookum Chooker purge.

* Remove some enderio compat, these plates/dusts are added via GT5 anyway now. This is obsolete.

* spotlessApply (#733)

Co-authored-by: GitHub GTNH Actions <>

* Unused textures

* Bump dep

* Revert "Remove force for realsies"

This reverts commit 0d28891.

* Revert "Remove Force material and associated other nonsense. Also remove some nuclear chem stuff."

This reverts commit 3455e6e.

* Remove nuclear items that are unused

* spotlessApply (#734)

Co-authored-by: GitHub GTNH Actions <>

---------

Co-authored-by: GTNH-Colen <54497873+GTNH-Colen@users.noreply.github.com>
Co-authored-by: Connor Colenso <colen@CONNORSPC>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
  • Loading branch information
4 people authored Sep 4, 2023
1 parent 0393b58 commit 76719d6
Show file tree
Hide file tree
Showing 353 changed files with 211 additions and 21,810 deletions.
2 changes: 1 addition & 1 deletion dependencies.gradle
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
dependencies {

api('com.github.GTNewHorizons:GT5-Unofficial:5.09.43.158:dev')
api("com.github.GTNewHorizons:bartworks:0.7.30:dev")
api("com.github.GTNewHorizons:bartworks:0.7.41:dev")

implementation('curse.maven:cofh-core-69162:2388751')
// https://www.curseforge.com/minecraft/mc-mods/advancedsolarpanels
Expand Down
7 changes: 0 additions & 7 deletions src/main/java/gtPlusPlus/GTplusplus.java
Original file line number Diff line number Diff line change
Expand Up @@ -46,11 +46,8 @@
import gtPlusPlus.core.handler.MobMentality;
import gtPlusPlus.core.handler.PacketHandler;
import gtPlusPlus.core.handler.Recipes.RegistrationHandler;
import gtPlusPlus.core.handler.events.BlockEventHandler;
import gtPlusPlus.core.handler.events.LoginEventHandler;
import gtPlusPlus.core.handler.events.MissingMappingsEvent;
import gtPlusPlus.core.item.ModItems;
import gtPlusPlus.core.item.general.ItemGiantEgg;
import gtPlusPlus.core.lib.CORE;
import gtPlusPlus.core.material.Material;
import gtPlusPlus.core.util.Utils;
Expand Down Expand Up @@ -138,7 +135,6 @@ public final synchronized void setPhaseActive(boolean aIsPhaseActive) {
public static void loadTextures() {
Logger.INFO("Loading some textures on the client.");
// Tools
Logger.WARNING("Processing texture: " + TexturesGtTools.SKOOKUM_CHOOCHER.getTextureFile().getResourcePath());
Logger.WARNING("Processing texture: " + TexturesGtTools.ANGLE_GRINDER.getTextureFile().getResourcePath());
Logger.WARNING("Processing texture: " + TexturesGtTools.ELECTRIC_SNIPS.getTextureFile().getResourcePath());
Logger.WARNING("Processing texture: " + TexturesGtTools.ELECTRIC_LIGHTER.getTextureFile().getResourcePath());
Expand Down Expand Up @@ -214,9 +210,6 @@ public void postInit(final FMLPostInitializationEvent event) {
Meta_GT_Proxy.postInit();
Core_Manager.postInit();

ItemGiantEgg.postInit(ModItems.itemBigEgg);
BlockEventHandler.init();

Logger.INFO("~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~");
Logger.INFO(
"| Recipes succesfully Loaded: " + RegistrationHandler.recipesSuccess
Expand Down
65 changes: 1 addition & 64 deletions src/main/java/gtPlusPlus/core/block/ModBlocks.java
Original file line number Diff line number Diff line change
@@ -1,56 +1,34 @@
package gtPlusPlus.core.block;

import net.minecraft.block.Block;
import net.minecraft.block.material.Material;
import net.minecraftforge.fluids.Fluid;

import gtPlusPlus.api.objects.Logger;
import gtPlusPlus.core.block.general.BlockCompressedObsidian;
import gtPlusPlus.core.block.general.BlockNet;
import gtPlusPlus.core.block.general.BlockTankXpConverter;
import gtPlusPlus.core.block.general.FirePit;
import gtPlusPlus.core.block.general.FluidTankInfinite;
import gtPlusPlus.core.block.general.HellFire;
import gtPlusPlus.core.block.general.LightGlass;
import gtPlusPlus.core.block.general.MiningExplosives;
import gtPlusPlus.core.block.general.PlayerDoors;
import gtPlusPlus.core.block.general.antigrief.BlockWitherProof;
import gtPlusPlus.core.block.general.redstone.BlockGenericRedstoneDetector;
import gtPlusPlus.core.block.general.redstone.BlockGenericRedstoneTest;
import gtPlusPlus.core.block.machine.CircuitProgrammer;
import gtPlusPlus.core.block.machine.DecayablesChest;
import gtPlusPlus.core.block.machine.EggBox;
import gtPlusPlus.core.block.machine.FishTrap;
import gtPlusPlus.core.block.machine.HeliumGenerator;
import gtPlusPlus.core.block.machine.Machine_ModularityTable;
import gtPlusPlus.core.block.machine.Machine_PestKiller;
import gtPlusPlus.core.block.machine.Machine_PooCollector;
import gtPlusPlus.core.block.machine.Machine_ProjectTable;
import gtPlusPlus.core.block.machine.Machine_RoundRobinator;
import gtPlusPlus.core.block.machine.Machine_SuperJukebox;
import gtPlusPlus.core.block.machine.Machine_TradeTable;
import gtPlusPlus.core.block.machine.VolumetricFlaskSetter;
import gtPlusPlus.core.block.machine.bedrock.Mining_Head_Fake;
import gtPlusPlus.core.block.machine.bedrock.Mining_Pipe_Fake;
import gtPlusPlus.core.fluids.FluidRegistryHandler;

public final class ModBlocks {

public static Block blockRoundRobinator;
public static Block blockCircuitProgrammer;
public static Block blockVolumetricFlaskSetter;
public static Block blockFakeMiningPipe;
public static Block blockFakeMiningHead;

public static Block blockFishTrap;
public static Block blockDecayablesChest;
public static Block blockEggBox;

// Blocks
// public static Block blockBloodSteel;
// public static Block blockStaballoy;
// WIP TODO public static Block blockToolBuilder;
public static Block blockGriefSaver;

public static Block blockCasingsMisc;
public static Block blockCasings2Misc;
Expand All @@ -64,41 +42,25 @@ public final class ModBlocks {
public static Block blockCustomMachineCasings;
public static Block blockCustomPipeGearCasings;

public static Block blockMetaTileEntity;
public static Block blockHeliumGenerator;
public static Block blockNHG;
public static Block blockCharger;

public static Block MatterFabricatorEffectBlock;

public static Fluid fluidSludge = new Fluid("fluid.sludge");
public static Block blockFluidSludge;

public static Block blockFirePit;

public static Block blockOreFluorite;

public static Block blockMiningExplosive;

public static Block blockHellfire;
public static Block blockInfiniteFLuidTank;
public static Block blockProjectTable;
public static Block blockTradeTable;
public static Block blockModularTable;

public static Block blockWitherGuard;
public static Block blockXpConverter;
public static Block blockCompressedObsidian;
public static Block blockNet;

public static Block blockPlayerDoorWooden;
public static Block blockPlayerDoorIron;
public static Block blockPlayerDoorCustom_Glass;
public static Block blockPlayerDoorCustom_Ice;
public static Block blockPlayerDoorCustom_Cactus;

public static Block blockCustomMobSpawner;
public static Block blockCustomSuperLight;
public static Block blockCustomJukebox;

public static Block blockPooCollector;
Expand All @@ -120,41 +82,18 @@ public static void registerBlocks() {
FluidRegistryHandler.registerFluids();

// Workbench
blockHeliumGenerator = new HeliumGenerator();
blockFirePit = new FirePit();
blockFishTrap = new FishTrap();
blockInfiniteFLuidTank = new FluidTankInfinite();
blockMiningExplosive = new MiningExplosives();
blockHellfire = new HellFire();
blockProjectTable = new Machine_ProjectTable();
blockTradeTable = new Machine_TradeTable();
blockModularTable = new Machine_ModularityTable();
blockWitherGuard = new BlockWitherProof();
blockXpConverter = new BlockTankXpConverter();
blockCompressedObsidian = new BlockCompressedObsidian();
blockNet = new BlockNet();

blockFakeMiningPipe = new Mining_Pipe_Fake();
blockFakeMiningHead = new Mining_Head_Fake();

blockCircuitProgrammer = new CircuitProgrammer();

blockDecayablesChest = new DecayablesChest();
blockEggBox = new EggBox();

blockPlayerDoorWooden = new PlayerDoors(Material.wood, "door_wood", true);
blockPlayerDoorIron = new PlayerDoors(Material.iron, "door_iron", true);
blockPlayerDoorCustom_Glass = new PlayerDoors(Material.glass, "door_glass", false);
blockPlayerDoorCustom_Ice = new PlayerDoors(Material.ice, "door_ice", false);
blockPlayerDoorCustom_Cactus = new PlayerDoors(
Material.cactus,
"door_cactus",
false,
0.6f,
Block.soundTypeGrass,
"Cactus");

// blockCustomSuperLight = new BlockSuperLight();

blockCustomJukebox = new Machine_SuperJukebox();

blockPooCollector = new Machine_PooCollector();
Expand All @@ -165,7 +104,5 @@ public static void registerBlocks() {

blockVolumetricFlaskSetter = new VolumetricFlaskSetter();

new BlockGenericRedstoneDetector();
new BlockGenericRedstoneTest();
}
}
37 changes: 0 additions & 37 deletions src/main/java/gtPlusPlus/core/block/general/BlockNet.java

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,6 @@ public void updateLighting(boolean enable) {
else if (enable && aLight == 0) {
aBlocksToUpdate.put(new BlockPos(xOff, yOff, zOff, this.worldObj));
if (aBlockGet instanceof BlockAir) {
Logger.INFO("Lit air.");
this.worldObj.setBlock(
xOff,
yOff,
Expand All @@ -188,7 +187,6 @@ else if (enable && aLight == 0) {
0,
3);
}
// aBlockGet.setLightLevel(15);
aLitCounter++;
}
// Turning Lights off
Expand Down
156 changes: 0 additions & 156 deletions src/main/java/gtPlusPlus/core/block/general/BlockTankXpConverter.java

This file was deleted.

Loading

0 comments on commit 76719d6

Please sign in to comment.