aboutsummaryrefslogtreecommitdiff
path: root/src/Java/gtPlusPlus/core/block
diff options
context:
space:
mode:
authorAlkalus <draknyte1@hotmail.com>2016-10-03 23:33:28 +1000
committerGitHub <noreply@github.com>2016-10-03 23:33:28 +1000
commite3f4a410ef0867359cab3ade72a20c3679aaad06 (patch)
tree2f008c251c080a216b0fcf3d03667f7233edceca /src/Java/gtPlusPlus/core/block
parent10aee9adf7a1ab793a05fd9327cec6fcc1b267d2 (diff)
parentbdb6fc4a5410d68cf517dbe90fa49cec45bbda5a (diff)
downloadGT5-Unofficial-e3f4a410ef0867359cab3ade72a20c3679aaad06.tar.gz
GT5-Unofficial-e3f4a410ef0867359cab3ade72a20c3679aaad06.tar.bz2
GT5-Unofficial-e3f4a410ef0867359cab3ade72a20c3679aaad06.zip
Merge pull request #19 from draknyte1/DesktopPC
+ Added some Buttons to the workbench (WIP) $ Workbench now uses the vanilla recipe handler. $ Fixed the tool slots on the Workbench accepting the wrong items in certain cases. + Added hundreds of new machine recipes for all of the materials, due to below. $ Rewrote recipe generation classes, things like plate bending and extrusion recipes now fall in line with GT tiering. + Added more functions to Materials.java, now you can get any item from them. (getDustSmall(5)) % Changed tool handling to better support older versions of Gregtech that don't allow Wrenchs to work as a BC/EIO wrench. % Moved more GT related content to HANDLER_GT. + Added a basic re-implementation of the Meta Tile Entity system for GT Machines, using my own blocks as a base. In a feeble attempt to store NBT data to Itemblocks on drop/break. % Changed lots of debug logging to only show in debug mode, if I missed anything, let me know.
Diffstat (limited to 'src/Java/gtPlusPlus/core/block')
-rw-r--r--src/Java/gtPlusPlus/core/block/ModBlocks.java6
-rw-r--r--src/Java/gtPlusPlus/core/block/machine/Machine_Workbench.java3
2 files changed, 3 insertions, 6 deletions
diff --git a/src/Java/gtPlusPlus/core/block/ModBlocks.java b/src/Java/gtPlusPlus/core/block/ModBlocks.java
index e8334af98b..b7a2526e30 100644
--- a/src/Java/gtPlusPlus/core/block/ModBlocks.java
+++ b/src/Java/gtPlusPlus/core/block/ModBlocks.java
@@ -5,7 +5,6 @@ import gtPlusPlus.core.block.machine.Machine_Workbench;
import gtPlusPlus.core.fluids.FluidRegistryHandler;
import gtPlusPlus.core.lib.CORE;
import gtPlusPlus.core.util.Utils;
-import gtPlusPlus.xmod.gregtech.common.blocks.GregtechMetaCasingBlocks;
import net.minecraft.block.Block;
import net.minecraft.block.material.Material;
import net.minecraftforge.fluids.Fluid;
@@ -20,6 +19,7 @@ public final class ModBlocks {
// WIP TODO public static Block blockToolBuilder;
public static Block blockGriefSaver;
public static Block blockCasingsMisc;
+ public static Block blockMetaTileEntity;
public static Block blockHeliumGenerator;
public static Block blockNHG;
public static Block blockCharger;
@@ -43,10 +43,6 @@ public final class ModBlocks {
Utils.LOG_INFO("Registering Blocks.");
GameRegistry.registerBlock(MatterFabricatorEffectBlock = new LightGlass(Material.glass, false).setHardness(0.1F).setBlockTextureName(CORE.MODID + ":" + "blockMFEffect").setStepSound(Block.soundTypeGlass), "blockMFEffect");
-
- //Casing Blocks
- blockCasingsMisc = new GregtechMetaCasingBlocks();
-
//Fluids
FluidRegistryHandler.registerFluids();
diff --git a/src/Java/gtPlusPlus/core/block/machine/Machine_Workbench.java b/src/Java/gtPlusPlus/core/block/machine/Machine_Workbench.java
index 92ba4a11cc..308413d81f 100644
--- a/src/Java/gtPlusPlus/core/block/machine/Machine_Workbench.java
+++ b/src/Java/gtPlusPlus/core/block/machine/Machine_Workbench.java
@@ -24,7 +24,8 @@ public class Machine_Workbench extends BlockContainer
@SideOnly(Side.CLIENT)
private IIcon textureFront;
- public Machine_Workbench()
+ @SuppressWarnings("deprecation")
+ public Machine_Workbench()
{
super(Material.iron);
this.setBlockName("blockWorkbenchGT");