Anvilcraft/Dartcraft
2
0
Fork 0
Code Issues 10 Pull requests Projects 1 Releases Wiki Activity

Refractoring

Browse source
This commit is contained in:
Timo Ley 2021-04-07 12:45:02 +02:00
parent fcac9a37f4
commit fc4fa0616a
19 changed files with 95 additions and 94 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/main/java/ley/modding/dartcraft/Dartcraft.java
View file

@ -6,11 +6,11 @@ import cpw.mods.fml.common.event.FMLInitializationEvent;
import cpw.mods.fml.common.event.FMLPostInitializationEvent;
import cpw.mods.fml.common.event.FMLPreInitializationEvent;
import cpw.mods.fml.common.registry.EntityRegistry;
import ley.modding.dartcraft.block.Blocks;
import ley.modding.dartcraft.block.DartBlocks;
import ley.modding.dartcraft.entity.*;
import ley.modding.dartcraft.event.EventHandler;
import ley.modding.dartcraft.internal.Registry;
import ley.modding.dartcraft.item.Items;
import ley.modding.dartcraft.item.DartItems;
import ley.modding.dartcraft.proxy.CommonProxy;
import ley.modding.dartcraft.tab.DartcraftTab;
import ley.modding.tileralib.api.IRegistry;
@ -39,8 +39,8 @@ public class Dartcraft {
@Mod.EventHandler
public void init(FMLInitializationEvent e) {
registry = new Registry();
Items.regsiter(registry);
Blocks.register(registry);
DartItems.regsiter(registry);
DartBlocks.register(registry);
proxy.init();

2
src/main/java/ley/modding/dartcraft/block/BlockForceLeaves.java
View file

@ -70,7 +70,7 @@ public class BlockForceLeaves extends BlockLeaves {
@Override
public Item getItemDropped(int p_149650_1_, Random p_149650_2_, int p_149650_3_) {
return Item.getItemFromBlock(Blocks.forcesapling);
return Item.getItemFromBlock(DartBlocks.forcesapling);
}
}

6
src/main/java/ley/modding/dartcraft/block/BlockPowerOre.java
View file

@ -1,7 +1,7 @@
package ley.modding.dartcraft.block;
import ley.modding.dartcraft.Dartcraft;
import ley.modding.dartcraft.item.Items;
import ley.modding.dartcraft.item.DartItems;
import ley.modding.dartcraft.util.Util;
import net.minecraft.block.Block;
import net.minecraft.block.material.Material;
@ -22,7 +22,7 @@ public class BlockPowerOre extends Block {
@Override
public Item getItemDropped(int par1, Random rand, int par3) {
return Items.forcegem;
return DartItems.forcegem;
}
@Override
@ -30,4 +30,6 @@ public class BlockPowerOre extends Block {
return rand.nextInt(3) + 2;
}
}

18
src/main/java/ley/modding/dartcraft/block/Blocks.java
View file

@ -1,18 +0,0 @@
package ley.modding.dartcraft.block;
import ley.modding.tileralib.api.IRegistry;
import net.minecraft.block.Block;
public class Blocks {
public static Block powerore;
public static Block forcesapling;
public static Block forcelog;
public static Block forceleaves;
public static void register(IRegistry reg) {
Blocks.forcesapling = reg.registerBlock(new BlockForceSapling());
Blocks.powerore = reg.registerBlock(new BlockPowerOre());
Blocks.forcelog = reg.registerBlock(new BlockForceLog());
Blocks.forceleaves = reg.registerBlock(new BlockForceLeaves());
}
}

18
src/main/java/ley/modding/dartcraft/block/DartBlocks.java Normal file
View file

@ -0,0 +1,18 @@
package ley.modding.dartcraft.block;
import ley.modding.tileralib.api.IRegistry;
import net.minecraft.block.Block;
public class DartBlocks {
public static Block powerore;
public static Block forcesapling;
public static Block forcelog;
public static Block forceleaves;
public static void register(IRegistry reg) {
DartBlocks.forcesapling = reg.registerBlock(new BlockForceSapling());
DartBlocks.powerore = reg.registerBlock(new BlockPowerOre());
DartBlocks.forcelog = reg.registerBlock(new BlockForceLog());
DartBlocks.forceleaves = reg.registerBlock(new BlockForceLeaves());
}
}

4
src/main/java/ley/modding/dartcraft/entity/EntityBottle.java
View file

@ -4,8 +4,8 @@ import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import ley.modding.dartcraft.Dartcraft;
import ley.modding.dartcraft.api.IBottleRenderable;
import ley.modding.dartcraft.item.DartItems;
import ley.modding.dartcraft.item.ItemEntityBottle;
import ley.modding.dartcraft.item.Items;
import ley.modding.dartcraft.util.EntityUtils;
import ley.modding.dartcraft.util.ItemUtils;
import net.minecraft.entity.Entity;
@ -35,7 +35,7 @@ public class EntityBottle extends EntityLivingBase implements IBottleRenderable
protected void entityInit() {
super.entityInit();
((Entity)this).getDataWatcher().addObject(12, new ItemStack(Items.entitybottle));
((Entity)this).getDataWatcher().addObject(12, new ItemStack(DartItems.entitybottle));
}
public void writeToNBT(NBTTagCompound comp) {

8
src/main/java/ley/modding/dartcraft/entity/EntityFlyingFlask.java
View file

@ -2,7 +2,7 @@ package ley.modding.dartcraft.entity;
import ley.modding.dartcraft.Dartcraft;
import ley.modding.dartcraft.api.IBottleRenderable;
import ley.modding.dartcraft.item.Items;
import ley.modding.dartcraft.item.DartItems;
import ley.modding.dartcraft.util.EntityUtils;
import ley.modding.dartcraft.util.ItemUtils;
import net.minecraft.entity.Entity;
@ -54,7 +54,7 @@ public class EntityFlyingFlask extends EntityThrowable implements IBottleRendera
protected void entityInit() {
super.entityInit();
((Entity)this).getDataWatcher().addObject(12, new ItemStack(Items.entitybottle));
((Entity)this).getDataWatcher().addObject(12, new ItemStack(DartItems.entitybottle));
}
protected void onImpact(MovingObjectPosition pos) {
@ -63,7 +63,7 @@ public class EntityFlyingFlask extends EntityThrowable implements IBottleRendera
this.contained.setPosition(((Entity)this).posX, ((Entity)this).posY, ((Entity)this).posZ);
((Entity)this).worldObj.spawnEntityInWorld((Entity)this.contained);
if (!this.creative) {
ItemStack flaskStack = new ItemStack(Items.forceflask);
ItemStack flaskStack = new ItemStack(DartItems.forceflask);
ItemUtils.dropItem(flaskStack, ((Entity)this).worldObj, ((Entity)this).posX, ((Entity)this).posY, ((Entity)this).posZ);
}
((Entity)this).worldObj.playSoundAtEntity((Entity)this, "random.pop", 1.0F,
@ -72,7 +72,7 @@ public class EntityFlyingFlask extends EntityThrowable implements IBottleRendera
if (!bottleEntity(pos.entityHit)) {
((Entity)this).worldObj.playSoundAtEntity((Entity)this, "random.pop", 1.0F,
EntityUtils.randomPitch());
ItemUtils.dropItem(new ItemStack(Items.forceflask), ((Entity)this).worldObj, ((Entity)this).posX, ((Entity)this).posY, ((Entity)this).posZ);
ItemUtils.dropItem(new ItemStack(DartItems.forceflask), ((Entity)this).worldObj, ((Entity)this).posX, ((Entity)this).posY, ((Entity)this).posZ);
}
}
setDead();

6
src/main/java/ley/modding/dartcraft/event/EntityBottleHandler.java
View file

@ -2,7 +2,7 @@ package ley.modding.dartcraft.event;
import cpw.mods.fml.common.Mod.EventHandler;
import ley.modding.dartcraft.Dartcraft;
import ley.modding.dartcraft.item.Items;
import ley.modding.dartcraft.item.DartItems;
import ley.modding.dartcraft.util.EntityUtils;
import net.minecraft.entity.Entity;
import net.minecraft.entity.EntityAgeable;
@ -23,7 +23,7 @@ public class EntityBottleHandler {
if (((PlayerEvent)event).entityPlayer == null || event.item == null || event.item.getEntityItem() == null)
return;
boolean trigger = false;
if (event.item.getEntityItem().getItem() == Items.entitybottle)
if (event.item.getEntityItem().getItem() == DartItems.entitybottle)
if (meshBottles(((PlayerEvent)event).entityPlayer, event.item.getEntityItem())) {
event.setCanceled(true);
trigger = true;
@ -72,7 +72,7 @@ public class EntityBottleHandler {
}
for (i = 0; i < player.inventory.mainInventory.length; i++) {
ItemStack invStack = player.inventory.mainInventory[i];
if (invStack != null && invStack.getItem() == Items.entitybottle && invStack
if (invStack != null && invStack.getItem() == DartItems.entitybottle && invStack
.hasTagCompound() && invStack.stackSize < invStack.getMaxStackSize()) {
EntityLivingBase entityTwo = (EntityLivingBase)EntityList.createEntityFromNBT(invStack
.getTagCompound(), null);

6
src/main/java/ley/modding/dartcraft/event/EventHandler.java
View file

@ -6,10 +6,10 @@ import ley.modding.dartcraft.api.IBreakable;
import ley.modding.dartcraft.entity.EntityColdChicken;
import ley.modding.dartcraft.entity.EntityColdCow;
import ley.modding.dartcraft.entity.EntityColdPig;
import ley.modding.dartcraft.item.Items;
import ley.modding.dartcraft.item.DartItems;
import net.minecraft.entity.passive.EntityAnimal;
import net.minecraft.entity.passive.EntityCow;
import net.minecraft.entity.passive.EntityChicken;
import net.minecraft.entity.passive.EntityCow;
import net.minecraft.entity.passive.EntityPig;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
@ -37,7 +37,7 @@ public class EventHandler {
return;
ItemStack heldItem = event.entityPlayer.getHeldItem();
if (heldItem != null && heldItem.getItem() != Items.forceshears)
if (heldItem == null || heldItem.getItem() != DartItems.forceshears)
return;
if (event.target instanceof EntityAnimal) {

34
src/main/java/ley/modding/dartcraft/item/DartItems.java Normal file
View file

@ -0,0 +1,34 @@
package ley.modding.dartcraft.item;
import ley.modding.dartcraft.item.tool.ItemForceMitts;
import ley.modding.dartcraft.item.tool.ItemForcePickaxe;
import ley.modding.dartcraft.item.tool.ItemForceShears;
import ley.modding.tileralib.api.IRegistry;
import net.minecraft.item.Item;
public class DartItems {
public static Item forcegem;
public static Item forceingot;
public static Item forcenugget;
public static Item forcestick;
public static Item forceshard;
public static Item forceshears;
public static Item forcepickaxe;
public static Item forcemitts;
public static Item forceflask;
public static Item entitybottle;
public static void regsiter(IRegistry reg) {
DartItems.forcegem = reg.registerItem(new BaseItem("forcegem"));
DartItems.forceingot = reg.registerItem(new BaseItem("forceingot"));
DartItems.forcenugget = reg.registerItem(new BaseItem("forcenugget"));
DartItems.forcestick = reg.registerItem(new BaseItem("forcestick"));
DartItems.forceshard = reg.registerItem(new BaseItem("forceshard"));
DartItems.forcemitts = reg.registerItem(new ItemForceMitts());
DartItems.forcepickaxe = reg.registerItem(new ItemForcePickaxe());
DartItems.forceshears = reg.registerItem(new ItemForceShears());
DartItems.forceflask = reg.registerItem(new ItemForceFlask());
DartItems.entitybottle = reg.registerItem(new ItemEntityBottle());
}
}

6
src/main/java/ley/modding/dartcraft/item/ItemEntityBottle.java
View file

@ -168,12 +168,12 @@ public class ItemEntityBottle extends Item {
stack.stackSize--;
if (!thrown) {
if (stack.stackSize > 0) {
if (!player.inventory.addItemStackToInventory(new ItemStack(Items.forceflask)))
if (!player.inventory.addItemStackToInventory(new ItemStack(DartItems.forceflask)))
if (Dartcraft.proxy.isSimulating(world))
ItemUtils.dropItem(new ItemStack(Items.forceflask), world, ((Entity)player).posX, ((Entity)player).posY, ((Entity)player).posZ);
ItemUtils.dropItem(new ItemStack(DartItems.forceflask), world, ((Entity)player).posX, ((Entity)player).posY, ((Entity)player).posZ);
return stack;
}
return new ItemStack(Items.forceflask);
return new ItemStack(DartItems.forceflask);
}
} else if (stack.getItemDamage() == 1) {

34
src/main/java/ley/modding/dartcraft/item/Items.java
View file

@ -1,34 +0,0 @@
package ley.modding.dartcraft.item;
import ley.modding.dartcraft.item.tool.ItemForceMitts;
import ley.modding.dartcraft.item.tool.ItemForcePickaxe;
import ley.modding.dartcraft.item.tool.ItemForceShears;
import ley.modding.tileralib.api.IRegistry;
import net.minecraft.item.Item;
public class Items {
public static Item forcegem;
public static Item forceingot;
public static Item forcenugget;
public static Item forcestick;
public static Item forceshard;
public static Item forceshears;
public static Item forcepickaxe;
public static Item forcemitts;
public static Item forceflask;
public static Item entitybottle;
public static void regsiter(IRegistry reg) {
Items.forcegem = reg.registerItem(new BaseItem("forcegem"));
Items.forceingot = reg.registerItem(new BaseItem("forceingot"));
Items.forcenugget = reg.registerItem(new BaseItem("forcenugget"));
Items.forcestick = reg.registerItem(new BaseItem("forcestick"));
Items.forceshard = reg.registerItem(new BaseItem("forceshard"));
Items.forcemitts = reg.registerItem(new ItemForceMitts());
Items.forcepickaxe = reg.registerItem(new ItemForcePickaxe());
Items.forceshears = reg.registerItem(new ItemForceShears());
Items.forceflask = reg.registerItem(new ItemForceFlask());
Items.entitybottle = reg.registerItem(new ItemEntityBottle());
}
}

4
src/main/java/ley/modding/dartcraft/item/tool/ItemForceMitts.java
View file

@ -3,7 +3,7 @@ package ley.modding.dartcraft.item.tool;
import cpw.mods.fml.common.eventhandler.Event;
import ley.modding.dartcraft.Dartcraft;
import ley.modding.dartcraft.api.IBreakable;
import ley.modding.dartcraft.item.Items;
import ley.modding.dartcraft.item.DartItems;
import net.minecraft.block.Block;
import net.minecraft.block.material.Material;
import net.minecraft.entity.EntityLivingBase;
@ -40,7 +40,7 @@ public class ItemForceMitts extends ItemTool implements IBreakable {
@Override
public ItemStack itemReturned() {
return new ItemStack(Items.forceshard);
return new ItemStack(DartItems.forceshard);
}
@Override

4
src/main/java/ley/modding/dartcraft/item/tool/ItemForcePickaxe.java
View file

@ -5,7 +5,7 @@ import cpw.mods.fml.relauncher.SideOnly;
import ley.modding.dartcraft.Dartcraft;
import ley.modding.dartcraft.api.IBreakable;
import ley.modding.dartcraft.api.IForceConsumer;
import ley.modding.dartcraft.item.Items;
import ley.modding.dartcraft.item.DartItems;
import ley.modding.dartcraft.util.ForceConsumerUtils;
import ley.modding.dartcraft.util.Util;
import net.minecraft.client.renderer.texture.IIconRegister;
@ -52,7 +52,7 @@ public class ItemForcePickaxe extends ItemPickaxe implements IBreakable, IForceC
@Override
public ItemStack itemReturned() {
return new ItemStack(Items.forceshard);
return new ItemStack(DartItems.forceshard);
}

5
src/main/java/ley/modding/dartcraft/item/tool/ItemForceShears.java
View file

@ -1,9 +1,8 @@
package ley.modding.dartcraft.item.tool;
import ley.modding.dartcraft.Dartcraft;
import ley.modding.dartcraft.api.IBreakable;
import ley.modding.dartcraft.api.IForceConsumer;
import ley.modding.dartcraft.item.Items;
import ley.modding.dartcraft.item.DartItems;
import ley.modding.dartcraft.util.ForceConsumerUtils;
import ley.modding.dartcraft.util.Util;
import net.minecraft.item.ItemShears;
@ -17,7 +16,7 @@ public class ItemForceShears extends ItemShears implements IBreakable, IForceCon
@Override
public ItemStack itemReturned() {
return new ItemStack(Items.forceshard);
return new ItemStack(DartItems.forceshard);
}
@Override

6
src/main/java/ley/modding/dartcraft/proxy/ClientProxy.java
View file

@ -6,7 +6,7 @@ import ley.modding.dartcraft.client.renderer.entity.RenderColdAnimal;
import ley.modding.dartcraft.client.renderer.entity.RenderEntityBottle;
import ley.modding.dartcraft.client.renderer.item.RenderItemForceFlask;
import ley.modding.dartcraft.entity.*;
import ley.modding.dartcraft.item.Items;
import ley.modding.dartcraft.item.DartItems;
import net.minecraft.client.model.ModelChicken;
import net.minecraft.client.model.ModelCow;
import net.minecraft.client.model.ModelPig;
@ -27,8 +27,8 @@ public class ClientProxy extends CommonProxy {
public void init() {
super.init();
MinecraftForgeClient.registerItemRenderer(Items.forceflask, RenderItemForceFlask.instance);
MinecraftForgeClient.registerItemRenderer(Items.entitybottle, RenderItemForceFlask.instance);
MinecraftForgeClient.registerItemRenderer(DartItems.forceflask, RenderItemForceFlask.instance);
MinecraftForgeClient.registerItemRenderer(DartItems.entitybottle, RenderItemForceFlask.instance);
RenderEntityBottle bottleRenderer = new RenderEntityBottle();
RenderingRegistry.registerEntityRenderingHandler(EntityBottle.class, bottleRenderer);
RenderingRegistry.registerEntityRenderingHandler(EntityFlyingFlask.class, bottleRenderer);

4
src/main/java/ley/modding/dartcraft/tab/DartcraftTab.java
View file

@ -1,6 +1,6 @@
package ley.modding.dartcraft.tab;
import ley.modding.dartcraft.item.Items;
import ley.modding.dartcraft.item.DartItems;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.item.Item;
@ -12,6 +12,6 @@ public class DartcraftTab extends CreativeTabs {
@Override
public Item getTabIconItem() {
return Items.forcegem;
return DartItems.forcegem;
}
}

4
src/main/java/ley/modding/dartcraft/util/EntityUtils.java
View file

@ -1,7 +1,7 @@
package ley.modding.dartcraft.util;
import ley.modding.dartcraft.Dartcraft;
import ley.modding.dartcraft.item.Items;
import ley.modding.dartcraft.item.DartItems;
import ley.modding.dartcraft.proxy.CommonProxy;
import net.minecraft.entity.Entity;
import net.minecraft.entity.EntityList;
@ -29,7 +29,7 @@ public class EntityUtils {
String entityName = EntityList.getEntityString(victim);
if (victim == null || entityName == null)
return null;
ItemStack bottleStack = new ItemStack(Items.entitybottle);
ItemStack bottleStack = new ItemStack(DartItems.entitybottle);
NBTTagCompound bottleComp = new NBTTagCompound();
victim.writeToNBT(bottleComp);
bottleComp.removeTag("OnGround");

12
src/main/java/ley/modding/dartcraft/worldgen/GenForceTree.java
View file

@ -1,14 +1,14 @@
package ley.modding.dartcraft.worldgen;
import java.util.Random;
import ley.modding.dartcraft.block.Blocks;
import ley.modding.dartcraft.block.DartBlocks;
import net.minecraft.block.Block;
import net.minecraft.block.BlockSapling;
import net.minecraft.world.World;
import net.minecraft.world.gen.feature.WorldGenAbstractTree;
import net.minecraftforge.common.util.ForgeDirection;
import java.util.Random;
public class GenForceTree extends WorldGenAbstractTree {
/** The minimum height of a generated tree. */
private final int minTreeHeight;
@ -72,7 +72,7 @@ public class GenForceTree extends WorldGenAbstractTree {
boolean isSoil =
block2.canSustainPlant(
world, x, y - 1, z, ForgeDirection.UP, (BlockSapling) Blocks.forcesapling);
world, x, y - 1, z, ForgeDirection.UP, (BlockSapling) DartBlocks.forcesapling);
if (isSoil && y < 256 - treeHeight - 1) {
block2.onPlantGrow(world, x, y - 1, z, x, y, z);
b0 = 3;
@ -97,7 +97,7 @@ public class GenForceTree extends WorldGenAbstractTree {
if (block1.isAir(world, i2, k1, k2) || block1.isLeaves(world, i2, k1, k2)) {
this.setBlockAndNotifyAdequately(
world, i2, k1, k2, Blocks.forceleaves, this.metaLeaves);
world, i2, k1, k2, DartBlocks.forceleaves, this.metaLeaves);
}
}
}
@ -108,7 +108,7 @@ public class GenForceTree extends WorldGenAbstractTree {
block = world.getBlock(x, y + k1, z);
if (block.isAir(world, x, y + k1, z) || block.isLeaves(world, x, y + k1, z)) {
this.setBlockAndNotifyAdequately(world, x, y + k1, z, Blocks.forcelog, this.metaWood);
this.setBlockAndNotifyAdequately(world, x, y + k1, z, DartBlocks.forcelog, this.metaWood);
}
}