From 5cef7badac1798830ce3e720cce823d35608f3a0 Mon Sep 17 00:00:00 2001 From: Ellpeck Date: Thu, 19 May 2016 16:03:37 +0200 Subject: [PATCH] Removed Firework Box Minecart. Aaw :( --- .../mod/ActuallyAdditions.java | 2 - .../mod/creative/CreativeTab.java | 1 - .../mod/entity/EntityFireworkBoxMinecart.java | 74 ------------------- .../mod/entity/EntityRFMinecart.java | 46 ------------ .../mod/entity/InitEntities.java | 28 ------- .../mod/items/InitItems.java | 3 - .../mod/items/ItemFireworkBoxMinecart.java | 30 -------- .../models/item/itemMinecartFireworkBox.json | 6 -- 8 files changed, 190 deletions(-) delete mode 100644 src/main/java/de/ellpeck/actuallyadditions/mod/entity/EntityFireworkBoxMinecart.java delete mode 100644 src/main/java/de/ellpeck/actuallyadditions/mod/entity/EntityRFMinecart.java delete mode 100644 src/main/java/de/ellpeck/actuallyadditions/mod/entity/InitEntities.java delete mode 100644 src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemFireworkBoxMinecart.java delete mode 100644 src/main/resources/assets/actuallyadditions/models/item/itemMinecartFireworkBox.json diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/ActuallyAdditions.java b/src/main/java/de/ellpeck/actuallyadditions/mod/ActuallyAdditions.java index 27bb736cb..19cd898ff 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/ActuallyAdditions.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/ActuallyAdditions.java @@ -19,7 +19,6 @@ import de.ellpeck.actuallyadditions.mod.config.ConfigurationHandler; import de.ellpeck.actuallyadditions.mod.crafting.CrusherCrafting; import de.ellpeck.actuallyadditions.mod.crafting.InitCrafting; import de.ellpeck.actuallyadditions.mod.crafting.ItemCrafting; -import de.ellpeck.actuallyadditions.mod.entity.InitEntities; import de.ellpeck.actuallyadditions.mod.event.InitEvents; import de.ellpeck.actuallyadditions.mod.fluids.InitFluids; import de.ellpeck.actuallyadditions.mod.gen.cave.CaveWorldType; @@ -80,7 +79,6 @@ public class ActuallyAdditions{ PacketHandler.init(); InitToolMaterials.init(); InitArmorMaterials.init(); - InitEntities.init(); InitBlocks.init(); InitFluids.init(); InitItems.init(); diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/creative/CreativeTab.java b/src/main/java/de/ellpeck/actuallyadditions/mod/creative/CreativeTab.java index ef0387a22..fce687f15 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/creative/CreativeTab.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/creative/CreativeTab.java @@ -155,7 +155,6 @@ public class CreativeTab extends CreativeTabs{ this.add(InitItems.itemBatteryQuadruple); this.add(InitItems.itemBatteryQuintuple); this.add(InitItems.itemTeleStaff); - this.add(InitItems.itemMinecartFireworkBox); this.add(InitItems.itemGrowthRing); this.add(InitItems.itemMagnetRing); diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/entity/EntityFireworkBoxMinecart.java b/src/main/java/de/ellpeck/actuallyadditions/mod/entity/EntityFireworkBoxMinecart.java deleted file mode 100644 index 32f9e63da..000000000 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/entity/EntityFireworkBoxMinecart.java +++ /dev/null @@ -1,74 +0,0 @@ -/* - * This file ("EntityFireworkBoxMinecart.java") is part of the Actually Additions mod for Minecraft. - * It is created and owned by Ellpeck and distributed - * under the Actually Additions License to be found at - * http://ellpeck.de/actaddlicense - * View the source code at https://github.com/Ellpeck/ActuallyAdditions - * - * © 2015-2016 Ellpeck - */ - -package de.ellpeck.actuallyadditions.mod.entity; - -import de.ellpeck.actuallyadditions.mod.blocks.InitBlocks; -import de.ellpeck.actuallyadditions.mod.tile.TileEntityFireworkBox; -import net.minecraft.block.state.IBlockState; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.world.World; - -public class EntityFireworkBoxMinecart extends EntityRFMinecart{ - - private int cooldownTimer; - private boolean isPowered; - - public EntityFireworkBoxMinecart(World world){ - super(world, 20000, 1000); - } - - @Override - public void onActivatorRailPass(int x, int y, int z, boolean receivingPower){ - if(receivingPower != this.isPowered){ - this.isPowered = receivingPower; - } - } - - @Override - public void onUpdate(){ - super.onUpdate(); - - if(!this.worldObj.isRemote){ - if(this.cooldownTimer > 0 && this.isPowered){ - this.cooldownTimer--; - if(this.cooldownTimer <= 0){ - //TODO Check for power level here + make charging possible - TileEntityFireworkBox.spawnFireworks(this.worldObj, this.posX, this.posY, this.posZ); - this.storage.extractEnergy(TileEntityFireworkBox.USE_PER_SHOT, false); - } - } - else{ - this.cooldownTimer = 100; - } - } - } - - @Override - public IBlockState getDisplayTile(){ - return InitBlocks.blockFireworkBox.getDefaultState(); - } - - @Override - protected void writeEntityToNBT(NBTTagCompound compound){ - super.writeEntityToNBT(compound); - - compound.setInteger("Cooldown", this.cooldownTimer); - compound.setBoolean("Powered", this.isPowered); - } - - @Override - protected void readEntityFromNBT(NBTTagCompound compound){ - super.readEntityFromNBT(compound); - - this.cooldownTimer = compound.getInteger("Cooldown"); - this.isPowered = compound.getBoolean("Powered"); - } -} diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/entity/EntityRFMinecart.java b/src/main/java/de/ellpeck/actuallyadditions/mod/entity/EntityRFMinecart.java deleted file mode 100644 index 809e17e28..000000000 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/entity/EntityRFMinecart.java +++ /dev/null @@ -1,46 +0,0 @@ -/* - * This file ("EntityRFMinecart.java") is part of the Actually Additions mod for Minecraft. - * It is created and owned by Ellpeck and distributed - * under the Actually Additions License to be found at - * http://ellpeck.de/actaddlicense - * View the source code at https://github.com/Ellpeck/ActuallyAdditions - * - * © 2015-2016 Ellpeck - */ - -package de.ellpeck.actuallyadditions.mod.entity; - -import cofh.api.energy.EnergyStorage; -import net.minecraft.entity.item.EntityMinecart; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.world.World; - -public class EntityRFMinecart extends EntityMinecart{ - - public EnergyStorage storage; - - public EntityRFMinecart(World world, int rfCap, int maxTransfer){ - super(world); - - this.storage = new EnergyStorage(rfCap, maxTransfer); - } - - @Override - protected void writeEntityToNBT(NBTTagCompound compound){ - super.writeEntityToNBT(compound); - - this.storage.writeToNBT(compound); - } - - @Override - protected void readEntityFromNBT(NBTTagCompound compound){ - super.readEntityFromNBT(compound); - - this.storage.readFromNBT(compound); - } - - @Override - public Type getType(){ - return Type.CHEST; - } -} diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/entity/InitEntities.java b/src/main/java/de/ellpeck/actuallyadditions/mod/entity/InitEntities.java deleted file mode 100644 index 7e9371573..000000000 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/entity/InitEntities.java +++ /dev/null @@ -1,28 +0,0 @@ -/* - * This file ("InitEntities.java") is part of the Actually Additions mod for Minecraft. - * It is created and owned by Ellpeck and distributed - * under the Actually Additions License to be found at - * http://ellpeck.de/actaddlicense - * View the source code at https://github.com/Ellpeck/ActuallyAdditions - * - * © 2015-2016 Ellpeck - */ - -package de.ellpeck.actuallyadditions.mod.entity; - -import de.ellpeck.actuallyadditions.mod.ActuallyAdditions; -import de.ellpeck.actuallyadditions.mod.util.ModUtil; -import net.minecraft.entity.item.EntityMinecart; -import net.minecraftforge.common.util.EnumHelper; -import net.minecraftforge.fml.common.registry.EntityRegistry; - -import java.util.Locale; - -public class InitEntities{ - - public static void init(){ - ModUtil.LOGGER.info("Initializing Entities..."); - - EntityRegistry.registerModEntity(EntityFireworkBoxMinecart.class, ModUtil.MOD_ID+":minecartFireworkBox", 0, ActuallyAdditions.instance, 256, 1, true); - } -} diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/InitItems.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/InitItems.java index e60ccea3e..f88de705f 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/InitItems.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/InitItems.java @@ -206,12 +206,9 @@ public class InitItems{ public static Item itemRarmorModuleReconstructor; - public static Item itemMinecartFireworkBox; - public static void init(){ ModUtil.LOGGER.info("Initializing Items..."); - itemMinecartFireworkBox = new ItemFireworkBoxMinecart("itemMinecartFireworkBox"); itemSpawnerChanger = new ItemSpawnerChanger("itemSpawnerChanger"); itemMisc = new ItemMisc("itemMisc"); itemCrateKeeper = new ItemGeneric("itemCrateKeeper"); diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemFireworkBoxMinecart.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemFireworkBoxMinecart.java deleted file mode 100644 index a078784fe..000000000 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemFireworkBoxMinecart.java +++ /dev/null @@ -1,30 +0,0 @@ -/* - * This file ("ItemFireworkBoxMinecart.java") is part of the Actually Additions mod for Minecraft. - * It is created and owned by Ellpeck and distributed - * under the Actually Additions License to be found at - * http://ellpeck.de/actaddlicense - * View the source code at https://github.com/Ellpeck/ActuallyAdditions - * - * © 2015-2016 Ellpeck - */ - -package de.ellpeck.actuallyadditions.mod.items; - -import de.ellpeck.actuallyadditions.mod.entity.EntityFireworkBoxMinecart; -import net.minecraft.entity.Entity; -import net.minecraft.entity.item.EntityMinecart; -import net.minecraft.world.World; - -public class ItemFireworkBoxMinecart extends ItemMinecartAA{ - - public ItemFireworkBoxMinecart(String name){ - super(name); - } - - @Override - public EntityMinecart createCart(World world, double x, double y, double z){ - EntityMinecart entity = new EntityFireworkBoxMinecart(world); - entity.setPosition(x, y, z); - return entity; - } -} diff --git a/src/main/resources/assets/actuallyadditions/models/item/itemMinecartFireworkBox.json b/src/main/resources/assets/actuallyadditions/models/item/itemMinecartFireworkBox.json deleted file mode 100644 index 1b49d9e00..000000000 --- a/src/main/resources/assets/actuallyadditions/models/item/itemMinecartFireworkBox.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "actuallyadditions:item/standardItem", - "textures": { - "layer0": "actuallyadditions:items/itemMinecartFireworkBox" - } -}