mirror of
https://github.com/GTNewHorizons/Chisel.git
synced 2026-11-21 12:52:31 +00:00
Begin major feature structor overhaul. Just recipes left to do.
This commit is contained in:
1 parent
71016458bd
commit
85e58f4f57
32 files changed
+424
-2116
No files matched your search
@@ -0,0 +1,129 @@
|
||||
package com.cricketcraft.chisel.init;
|
||||
|
||||
import net.minecraft.block.Block;
|
||||
|
||||
import com.cricketcraft.chisel.Chisel;
|
||||
import com.cricketcraft.chisel.block.BlockCarvable;
|
||||
import com.cricketcraft.chisel.block.BlockCarvableGlass;
|
||||
import com.cricketcraft.chisel.block.BlockCarvablePane;
|
||||
import com.cricketcraft.chisel.block.BlockCarvablePowered;
|
||||
import com.cricketcraft.chisel.block.BlockCarvablePumpkin;
|
||||
import com.cricketcraft.chisel.block.BlockCarvableSand;
|
||||
import com.cricketcraft.chisel.block.BlockCloud;
|
||||
import com.cricketcraft.chisel.block.BlockConcrete;
|
||||
import com.cricketcraft.chisel.block.BlockGrimstone;
|
||||
import com.cricketcraft.chisel.block.BlockHolystone;
|
||||
import com.cricketcraft.chisel.block.BlockLavastone;
|
||||
import com.cricketcraft.chisel.block.BlockLightstoneCarvable;
|
||||
import com.cricketcraft.chisel.block.BlockMarbleCarpet;
|
||||
import com.cricketcraft.chisel.block.BlockMarbleIce;
|
||||
import com.cricketcraft.chisel.block.BlockMarbleIceStairs;
|
||||
import com.cricketcraft.chisel.block.BlockMarblePackedIce;
|
||||
import com.cricketcraft.chisel.block.BlockMarblePackedIceStairs;
|
||||
import com.cricketcraft.chisel.block.BlockMarbleSlab;
|
||||
import com.cricketcraft.chisel.block.BlockMarbleStairs;
|
||||
import com.cricketcraft.chisel.block.BlockMarbleTexturedOre;
|
||||
import com.cricketcraft.chisel.block.BlockMarbleWall;
|
||||
import com.cricketcraft.chisel.block.BlockPresent;
|
||||
import com.cricketcraft.chisel.block.BlockRoadLine;
|
||||
import com.cricketcraft.chisel.block.BlockSnakestone;
|
||||
import com.cricketcraft.chisel.block.BlockSnakestoneObsidian;
|
||||
import com.cricketcraft.chisel.block.BlockVoidstonePillar;
|
||||
import com.cricketcraft.chisel.block.BlockVoidstonePillar2;
|
||||
import com.cricketcraft.chisel.block.BlockWaterstone;
|
||||
|
||||
import cpw.mods.fml.common.registry.GameRegistry.ObjectHolder;
|
||||
|
||||
@ObjectHolder(Chisel.MOD_ID)
|
||||
public final class ChiselBlocks {
|
||||
|
||||
public static final Block autoChisel = null;
|
||||
public static final BlockCarvable marble = null;
|
||||
public static final BlockCarvable marble_pillar = null;
|
||||
public static final BlockCarvable limestone = null;
|
||||
public static final BlockMarbleSlab marble_slab = null;
|
||||
public static final BlockMarbleSlab limestone_slab = null;
|
||||
public static final BlockMarbleSlab marble_pillar_slab = null;
|
||||
public static final BlockCarvable cobblestone = null;
|
||||
public static final BlockMarbleWall cobblestoneWall = null;
|
||||
public static final BlockCarvableGlass glass = null;
|
||||
public static final BlockCarvablePane glass_pane = null;
|
||||
public static final BlockCarvable sandstone = null;
|
||||
public static final BlockCarvable sandstone_scribbles = null;
|
||||
public static final BlockConcrete concrete = null;
|
||||
public static final BlockRoadLine road_line = null;
|
||||
public static final BlockCarvable iron_block = null;
|
||||
public static final BlockCarvable gold_block = null;
|
||||
public static final BlockCarvable diamond_block = null;
|
||||
public static final BlockLightstoneCarvable glowstone = null;
|
||||
public static final BlockCarvable lapis_block = null;
|
||||
public static final BlockCarvable emerald_block = null;
|
||||
public static final BlockCarvable nether_brick = null;
|
||||
public static final BlockCarvable netherrack = null;
|
||||
public static final BlockCarvable mossy_cobblestone = null;
|
||||
public static final BlockCarvable stonebricksmooth = null;
|
||||
public static final BlockMarbleStairs marbleStairs = null;
|
||||
public static final BlockMarbleStairs limestoneStairs = null;
|
||||
public static final BlockCarvablePane iron_bars = null;
|
||||
public static final BlockMarbleIce ice = null;
|
||||
public static final BlockMarbleIce ice_pillar = null;
|
||||
public static final BlockMarblePackedIce packedice = null;
|
||||
public static final BlockMarblePackedIce packedice_pillar = null;
|
||||
public static final BlockMarbleIceStairs iceStairs = null;
|
||||
public static final BlockMarblePackedIceStairs packediceStairs = null;
|
||||
public static final BlockCarvable[] planks = new BlockCarvable[6];
|
||||
public static final BlockCarvable obsidian = null;
|
||||
public static final BlockCarvablePowered redstone_block = null;
|
||||
public static final BlockHolystone holystone = null;
|
||||
public static final BlockGrimstone grimstone = null;
|
||||
public static final BlockLavastone lavastone = null;
|
||||
public static final BlockWaterstone waterstone = null;
|
||||
public static final BlockCarvable leaves = null;
|
||||
public static final BlockCarvable fantasy = null;
|
||||
public static final BlockCarvable fantasyblock2 = null;
|
||||
public static final BlockCarvable carpet_block = null;
|
||||
public static final BlockMarbleCarpet carpet = null;
|
||||
public static final BlockCarvable bookshelf = null;
|
||||
public static final BlockCarvable tyrian = null;
|
||||
public static final BlockCarvable dirt = null;
|
||||
public static final BlockCloud cloud = null;
|
||||
public static final BlockCarvable templeblock = null;
|
||||
public static final BlockCarvable mossy_templeblock = null;
|
||||
public static final BlockCarvable factoryblock = null;
|
||||
public static final BlockCarvablePane paperwall = null;
|
||||
public static final BlockCarvable woolen_clay = null;
|
||||
public static final BlockCarvable laboratoryblock = null;
|
||||
public static final BlockCarvablePumpkin[] pumpkin = new BlockCarvablePumpkin[16];
|
||||
public static final BlockCarvablePumpkin[] jackolantern = new BlockCarvablePumpkin[16];
|
||||
public static final BlockCarvable voidstone = null;
|
||||
public static final BlockMarbleTexturedOre voidstone2 = null;
|
||||
public static final BlockVoidstonePillar voidstonePillar = null;
|
||||
public static final BlockVoidstonePillar2 voidstonePillar2 = null;
|
||||
public static final BlockPresent[] present = new BlockPresent[16];
|
||||
public static final BlockSnakestone stone_snakestone = null;
|
||||
public static final BlockSnakestone sand_snakestone = null;
|
||||
public static final BlockSnakestoneObsidian obsidian_snakestone = null;
|
||||
public static final BlockCarvable hexPlating = null;
|
||||
public static final BlockCarvable technical = null;
|
||||
public static final BlockCarvableGlass technical2 = null;
|
||||
public static final BlockCarvable futura = null;
|
||||
public static final BlockCarvable bone = null;
|
||||
public static final BlockCarvable scorching = null;
|
||||
public static final BlockCarvable brickCustom = null;
|
||||
public static final BlockCarvable sign = null;
|
||||
public static final BlockCarvable arcane = null;
|
||||
public static final BlockCarvable bloodRune = null;
|
||||
public static final BlockCarvableSand colored_sand = null;
|
||||
|
||||
// 1.7
|
||||
public static final BlockCarvableGlass[] stainedGlass = new BlockCarvableGlass[4];
|
||||
public static final BlockCarvablePane[] stainedGlassPane = new BlockCarvablePane[8];
|
||||
|
||||
// 1.8 or at least so you think :P
|
||||
public static final BlockCarvable granite = null;
|
||||
public static final BlockCarvable diorite = null;
|
||||
public static final BlockCarvable andesite = null;
|
||||
|
||||
private ChiselBlocks() {
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,23 @@
|
||||
package com.cricketcraft.chisel.init;
|
||||
|
||||
import com.cricketcraft.chisel.Chisel;
|
||||
import com.cricketcraft.chisel.item.ItemBallOMoss;
|
||||
import com.cricketcraft.chisel.item.ItemChisel;
|
||||
import com.cricketcraft.chisel.item.ItemCloudInABottle;
|
||||
import com.cricketcraft.chisel.item.ItemSmashingRock;
|
||||
import com.cricketcraft.chisel.item.ItemUpgrade;
|
||||
|
||||
import cpw.mods.fml.common.registry.GameRegistry.ObjectHolder;
|
||||
|
||||
@ObjectHolder(Chisel.MOD_ID)
|
||||
public final class ChiselItems {
|
||||
|
||||
public static final ItemChisel chisel = null;
|
||||
public static final ItemCloudInABottle itemCloudInABottle = null;
|
||||
public static final ItemBallOMoss itemBallOMoss = null;
|
||||
public static final ItemSmashingRock smashingRock = null;
|
||||
public static final ItemUpgrade upgrade = null;
|
||||
|
||||
private ChiselItems() {
|
||||
}
|
||||
}
|
||||
+8
-8
@@ -8,7 +8,7 @@ import com.cricketcraft.chisel.Chisel;
|
||||
|
||||
import cpw.mods.fml.common.Loader;
|
||||
|
||||
public class ModTabs {
|
||||
public class ChiselTabs {
|
||||
|
||||
private static boolean atLeastOneModIsLoaded = false;
|
||||
|
||||
@@ -21,7 +21,7 @@ public class ModTabs {
|
||||
|
||||
@Override
|
||||
public Item getTabIconItem() {
|
||||
return ModItems.chisel;
|
||||
return ChiselItems.chisel;
|
||||
}
|
||||
};
|
||||
|
||||
@@ -38,11 +38,11 @@ public class ModTabs {
|
||||
public Item getTabIconItem() {
|
||||
|
||||
if (Loader.isModLoaded("Thaumcraft")) {
|
||||
return Item.getItemFromBlock(ModBlocks.arcane);
|
||||
return Item.getItemFromBlock(ChiselBlocks.arcane);
|
||||
} else if (Loader.isModLoaded("AWWayOfTime")) {
|
||||
return Item.getItemFromBlock(ModBlocks.bloodRune);
|
||||
return Item.getItemFromBlock(ChiselBlocks.bloodRune);
|
||||
} else {
|
||||
return Item.getItemFromBlock(ModBlocks.voidstone);
|
||||
return Item.getItemFromBlock(ChiselBlocks.voidstone);
|
||||
}
|
||||
}
|
||||
};
|
||||
@@ -52,7 +52,7 @@ public class ModTabs {
|
||||
|
||||
@Override
|
||||
public Item getTabIconItem() {
|
||||
return Item.getItemFromBlock(ModBlocks.holystone);
|
||||
return Item.getItemFromBlock(ChiselBlocks.holystone);
|
||||
}
|
||||
};
|
||||
|
||||
@@ -68,7 +68,7 @@ public class ModTabs {
|
||||
|
||||
@Override
|
||||
public Item getTabIconItem() {
|
||||
return Item.getItemFromBlock(ModBlocks.technical);
|
||||
return Item.getItemFromBlock(ChiselBlocks.technical);
|
||||
}
|
||||
};
|
||||
|
||||
@@ -76,7 +76,7 @@ public class ModTabs {
|
||||
|
||||
@Override
|
||||
public Item getTabIconItem() {
|
||||
return Item.getItemFromBlock(ModBlocks.jackolantern[0]);
|
||||
return Item.getItemFromBlock(ChiselBlocks.jackolantern[0]);
|
||||
}
|
||||
};
|
||||
}
|
||||
File diff suppressed because it is too large.
Load diff
@@ -1,52 +0,0 @@
|
||||
package com.cricketcraft.chisel.init;
|
||||
|
||||
import com.cricketcraft.chisel.Chisel;
|
||||
import com.cricketcraft.chisel.Configurations;
|
||||
import com.cricketcraft.chisel.entity.EntityBallOMoss;
|
||||
import com.cricketcraft.chisel.entity.EntityCloudInABottle;
|
||||
import com.cricketcraft.chisel.entity.EntitySmashingRock;
|
||||
import com.cricketcraft.chisel.item.ItemBallOMoss;
|
||||
import com.cricketcraft.chisel.item.ItemChisel;
|
||||
import com.cricketcraft.chisel.item.ItemCloudInABottle;
|
||||
import com.cricketcraft.chisel.item.ItemSmashingRock;
|
||||
import com.cricketcraft.chisel.item.ItemUpgrade;
|
||||
|
||||
import cpw.mods.fml.common.registry.EntityRegistry;
|
||||
import cpw.mods.fml.common.registry.GameRegistry;
|
||||
|
||||
public class ModItems {
|
||||
|
||||
public static ItemChisel chisel;
|
||||
public static ItemCloudInABottle itemCloudInABottle;
|
||||
public static ItemBallOMoss itemBallOMoss;
|
||||
public static ItemSmashingRock smashingRock;
|
||||
public static ItemUpgrade upgrade;
|
||||
|
||||
public static void load() {
|
||||
chisel = (ItemChisel) new ItemChisel().setCreativeTab(ModTabs.tabChisel);
|
||||
GameRegistry.registerItem(chisel, "chisel");
|
||||
|
||||
if (Configurations.featureEnabled("cloud")) {
|
||||
itemCloudInABottle = (ItemCloudInABottle) new ItemCloudInABottle().setTextureName("Chisel:cloudinabottle-x").setCreativeTab(ModTabs.tabChisel);
|
||||
EntityRegistry.registerModEntity(EntityCloudInABottle.class, "CloudInABottle", 1, Chisel.instance, 40, 1, true);
|
||||
GameRegistry.registerItem(itemCloudInABottle, "cloudinabottle");
|
||||
}
|
||||
|
||||
if (Configurations.featureEnabled("ballOfMoss")) {
|
||||
itemBallOMoss = (ItemBallOMoss) new ItemBallOMoss().setTextureName("Chisel:ballomoss").setCreativeTab(ModTabs.tabChisel);
|
||||
EntityRegistry.registerModEntity(EntityBallOMoss.class, "BallOMoss", 2, Chisel.instance, 40, 1, true);
|
||||
GameRegistry.registerItem(itemBallOMoss, "ballomoss");
|
||||
}
|
||||
|
||||
if (Configurations.featureEnabled("smashingRock")) {
|
||||
smashingRock = (ItemSmashingRock) new ItemSmashingRock().setTextureName("Chisel:smashingrock").setCreativeTab(ModTabs.tabChisel);
|
||||
EntityRegistry.registerModEntity(EntitySmashingRock.class, "SmashingRock", 2, Chisel.instance, 40, 1, true);
|
||||
GameRegistry.registerItem(smashingRock, "smashingrock");
|
||||
}
|
||||
|
||||
if (Configurations.featureEnabled("autoChiselUpgrades")) {
|
||||
upgrade = (ItemUpgrade) new ItemUpgrade("upgrade").setCreativeTab(ModTabs.tabChisel);
|
||||
GameRegistry.registerItem(upgrade, upgrade.getUnlocalizedName());
|
||||
}
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user