Skip to content
This repository has been archived by the owner on Jul 13, 2022. It is now read-only.

Commit

Permalink
updated code
Browse files Browse the repository at this point in the history
  • Loading branch information
@roryclaasen
roryclaasen committed Jul 20, 2017
1 parent 7d827c6 commit c433e28
Show file tree
Hide file tree
Showing 8 changed files with 17 additions and 13 deletions.
5 changes: 4 additions & 1 deletion src/main/java/me/roryclaasen/rorysmod/core/init/ModBlocks.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
import me.roryclaasen.rorysmod.block.BlockRifleTable;
import me.roryclaasen.rorysmod.block.BlockTestingWall;
import me.roryclaasen.rorysmod.block.base.MultiBlockHandler;
import me.roryclaasen.rorysmod.core.RorysMod;
import me.roryclaasen.rorysmod.core.register.Register;
import me.roryclaasen.rorysmod.item.block.ItemMachineRenamer;
import me.roryclaasen.rorysmod.item.block.ItemPoweredChest;
Expand Down Expand Up @@ -70,7 +71,7 @@ public void register(FMLPreInitializationEvent event) {

Register.registerBlock(renamer, ItemMachineRenamer.class);
Register.registerBlock(solderBlock);

Register.registerDictionary("blockSteel", steelBlock);
for (int i = 0; i < ((BlockBaseMeta) testingWall).getMetaSize(); i++) {
Register.registerDictionary("testingWall", new ItemStack(testingWall, 1, i));
Expand Down Expand Up @@ -106,6 +107,8 @@ public void init(FMLInitializationEvent event) {

@Override
public void postinit(FMLPostInitializationEvent event) {
Register.addPulverizerRecipe(2400, new ItemStack(steelBlock), new ItemStack(RorysMod.items.steelDust, 9));
Register.addPulverizerRecipe(2400, new ItemStack(solderBlock), new ItemStack(RorysMod.items.solderDust, 9));
if (Loader.isModLoaded("ThermalExpansion")) {
Register.addShapedRecipie(new ItemStack(renamer), new Object[] { " n ", "gmg", "csc", 'n', Items.name_tag, 'g', "blockGlass", 'm', "thermalexpansion:machineFrame", 'c', "gearCopper", 's', "plateSteel" });
}
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/me/roryclaasen/rorysmod/core/init/ModItems.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@ public void init(FMLInitializationEvent event) {
Register.addShapedRecipie(new ItemStack(blankCircuit), new Object[] { " r ", "gsg", " r ", 'r', Items.redstone, 's', "plateSteel", 'g', Items.gold_nugget });
Register.addShapelessChargedRecipie(new ItemStack(circuit), new Object[] { blankCircuit, "solder", toolSolderingIron });

Register.addShapedRecipie(new ItemStack(blankAdvancedCircuit), new Object[] { "rgr", "lcl", "rgr", 'l', new ItemStack(Items.dye, 1, 4), 'r', Items.redstone, 'g', Items.glowstone_dust, 'c', "cpu" });
Register.addShapelessChargedRecipie(new ItemStack(blankAdvancedCircuit), new Object[] { blankCircuit, "cpu", "solder", toolSolderingIron });
Register.addShapelessChargedRecipie(new ItemStack(advancedCircuit), new Object[] { blankAdvancedCircuit, "solder", toolSolderingIron });

// Lens
Expand Down Expand Up @@ -192,7 +192,7 @@ public void init(FMLInitializationEvent event) {
Register.addShapedRecipie(new ItemStack(rifleUpgrade, 1, 7), new Object[] { "f", "b", 'b', new ItemStack(rifleUpgrade), 'f', Items.flint_and_steel });

// Soldering Iron
Register.addShapedRecipie(new ItemStack(solderingIron), new Object[] { " i", " i ", "c ", 'i', "ingotIron", 'c', IC2Items.getItem("copperCableItem") });
Register.addShapedRecipie(new ItemStack(solderingIron), new Object[] { " i", " i ", "c ", 'i', "ingotIron", 'c', IC2Items.getItem("insulatedCopperCableItem") });

// Solder
Register.addShapelessRecipie(new ItemStack(solderDust, 5), new Object[] { "dustTin", "dustTin", "dustTin", "dustLead", "dustLead" });
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/me/roryclaasen/rorysmod/item/ItemCoil.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ public class ItemCoil extends ItemBase {

public ItemCoil(String unlocalizedName) {
super(unlocalizedName);
setMaxDamage(8);
setMaxDamage(7);
setMaxStackSize(1);
}

Expand All @@ -47,6 +47,6 @@ public ItemStack getContainerItem(ItemStack itemstack) {
@SuppressWarnings({ "unchecked", "rawtypes" })
@Override
public void addInformation(ItemStack stack, EntityPlayer playerIn, List tooltip, boolean advanced) {
tooltip.add(StatCollector.translateToLocal("message.rorymod.useslesft") + (stack.getMaxDamage() - stack.getItemDamage()));
tooltip.add(StatCollector.translateToLocal("message.rorymod.useslesft") + (stack.getMaxDamage() - stack.getItemDamage() + 1));
}
}
8 changes: 6 additions & 2 deletions src/main/java/me/roryclaasen/rorysmod/item/base/ItemBaseEnergyContainer.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ public ItemBaseEnergyContainer(String unlocalizedName, int capacity, int maxRece
this.setUnlocalizedName(RorysMod.MODID + "_" + unlocalizedName);
this.setTextureName(RorysMod.MODID + ":" + unlocalizedName);
this.setCreativeTab(RorysMod.tab);
this.setMaxDamage(100);

this.internalName = unlocalizedName;
this.baseCapacity = capacity;
Expand Down Expand Up @@ -78,8 +79,11 @@ public int extractEnergy(ItemStack paramItemStack, int paramInt, boolean paramBo
}

protected void updateItemDamage(ItemStack itemstack) {
int percentage = (int) ((getEnergyStored(itemstack) / capacity) * (double) 100);
itemstack.setItemDamage(getMaxDamage() - percentage);
double energy = getEnergyStored(itemstack);
double capacity = getMaxEnergyStored(itemstack);

int percentage = (int) Math.round((energy / capacity) * 100.0D);
itemstack.setItemDamage(itemstack.getMaxDamage() - percentage);
}

@SuppressWarnings({ "unchecked", "rawtypes" })
Expand Down
1 change: 0 additions & 1 deletion src/main/java/me/roryclaasen/rorysmod/item/tools/ItemRifle.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@ public class ItemRifle extends ItemBaseEnergyContainer {
public ItemRifle(String unlocalizedName, int tier) {
super(unlocalizedName, 1000 * (tier), 10, 50);
this.setMaxStackSize(1);
this.setMaxDamage(100);
this.setFull3D();
this.setTier(tier);
}
Expand Down
1 change: 0 additions & 1 deletion src/main/java/me/roryclaasen/rorysmod/item/tools/ItemSolderingIron.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ public class ItemSolderingIron extends ItemBaseEnergyContainer implements IBoxab
public ItemSolderingIron(String unlocalizedName) {
super(unlocalizedName, 100, 2);
this.setMaxStackSize(1);
this.setMaxDamage(100);

this.canRepair = false;
}
Expand Down
6 changes: 2 additions & 4 deletions src/main/java/me/roryclaasen/rorysmod/util/RecipeUtils.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,10 +65,8 @@ public static IRecipe getRecipeFromGrid(InventoryCrafting inv, World world) {
public static boolean hasEnergy(ItemStack itemStack) {
if (itemStack != null && itemStack.getItem() != null && itemStack.getItem() instanceof ItemBaseEnergyContainer) {
if (itemStack.getItemDamage() == itemStack.getMaxDamage()) return false;
else if (itemStack.getItemDamage() == 0) {
int energy = ((ItemBaseEnergyContainer) itemStack.getItem()).getEnergyStored(itemStack);
if (energy > 0) return true;
} else return true;
int energy = ((ItemBaseEnergyContainer) itemStack.getItem()).getEnergyStored(itemStack);
if (energy > 0) return true;
}
return false;
}
Expand Down
1 change: 1 addition & 0 deletions src/main/resources/assets/rorysmod/lang/en_US.lang
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ tile.rorysmod_blockBluePrint_4.name=Blueprint Block
tile.rorysmod_blockBluePrint_5.name=Blueprint Block
tile.rorysmod_blockChestPowered.name=Powerable Chest
tile.rorysmod_machineRenamer.name=Auto Renamer
tile.rorysmod_blockStolder.name=Solder Block

// ----------------{ Items }----------------
item.rorysmod_ingotSteel.name=Steel Ingot
Expand Down

0 comments on commit c433e28

Please sign in to comment.