Merge remote-tracking branch 'remotes/origin/feature/containers-builder' into 1.11.2

# Conflicts:
#	src/main/java/techreborn/client/container/ContainerAlloyFurnace.java
#	src/main/java/techreborn/tiles/TileAlloyFurnace.java
This commit is contained in:
modmuss50 2017-01-10 19:34:17 +00:00
commit 8b24fdf765
No known key found for this signature in database
GPG key ID: 203A5ED4D3E48BEA
195 changed files with 4701 additions and 5523 deletions

View file

@ -1,30 +1,33 @@
package techreborn.items;
import me.modmuss50.jsonDestroyer.api.ITexturedItem;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
import net.minecraft.util.ActionResult;
import net.minecraft.util.EnumActionResult;
import net.minecraft.util.EnumHand;
import net.minecraft.world.World;
import reborncore.RebornCore;
import techreborn.Core;
import techreborn.client.GuiHandler;
import techreborn.client.EGui;
import techreborn.client.TechRebornCreativeTabMisc;
import me.modmuss50.jsonDestroyer.api.ITexturedItem;
public class ItemDestructopack extends ItemTextureBase implements ITexturedItem {
public ItemDestructopack() {
setUnlocalizedName("techreborn.destructopack");
setCreativeTab(TechRebornCreativeTabMisc.instance);
this.setUnlocalizedName("techreborn.destructopack");
this.setCreativeTab(TechRebornCreativeTabMisc.instance);
RebornCore.jsonDestroyer.registerObject(this);
}
@Override
public ActionResult<ItemStack> onItemRightClick(World world, EntityPlayer player,
EnumHand hand) {
player.openGui(Core.INSTANCE, GuiHandler.destructoPackID, world, (int) player.posX, (int) player.posY,
(int) player.posY);
public ActionResult<ItemStack> onItemRightClick(final World world, final EntityPlayer player,
final EnumHand hand) {
player.openGui(Core.INSTANCE, EGui.DESTRUCTOPACK.ordinal(), world, (int) player.posX, (int) player.posY,
(int) player.posY);
return new ActionResult<>(EnumActionResult.SUCCESS, player.getHeldItem(hand));
}
@ -34,7 +37,7 @@ public class ItemDestructopack extends ItemTextureBase implements ITexturedItem
}
@Override
public String getTextureName(int arg0) {
public String getTextureName(final int arg0) {
return "techreborn:items/misc/destructopack";
}
}

View file

@ -1,14 +1,16 @@
package techreborn.items;
import com.google.common.base.CaseFormat;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.util.NonNullList;
import net.minecraft.world.World;
import techreborn.Core;
import techreborn.client.GuiHandler;
import techreborn.client.EGui;
import techreborn.client.TechRebornCreativeTab;
import techreborn.init.ModItems;
@ -16,21 +18,21 @@ import java.security.InvalidParameterException;
public class ItemParts extends ItemTRNoDestroy {
public static final String[] types = new String[] { "energy_flow_circuit", "data_control_circuit", "data_storage_circuit",
"data_orb", "diamond_grinding_head", "diamond_saw_blade", "tungsten_grinding_head", "helium_coolant_simple",
"helium_coolant_triple", "helium_coolant_six", "nak_coolant_simple", "nak_coolant_triple", "nak_coolant_six",
"cupronickel_heating_coil", "nichrome_heating_coil", "kanthal_heating_coil", ModItems.META_PLACEHOLDER, "super_conductor",
"thorium_cell", "double_thorium_cell", "quad_thorium_cell", "plutonium_cell", "double_plutonium_cell",
"quad_plutonium_cell", "computer_monitor", "machine_parts", "neutron_reflector", "iridium_neutron_reflector",
"thick_neutron_reflector", "electronic_circuit", "advanced_circuit", "sap", "rubber", "scrap",
"carbon_mesh", "carbon_fiber", "coolant_simple", "coolant_triple", "coolant_six" };
"data_orb", "diamond_grinding_head", "diamond_saw_blade", "tungsten_grinding_head", "helium_coolant_simple",
"helium_coolant_triple", "helium_coolant_six", "nak_coolant_simple", "nak_coolant_triple", "nak_coolant_six",
"cupronickel_heating_coil", "nichrome_heating_coil", "kanthal_heating_coil", ModItems.META_PLACEHOLDER, "super_conductor",
"thorium_cell", "double_thorium_cell", "quad_thorium_cell", "plutonium_cell", "double_plutonium_cell",
"quad_plutonium_cell", "computer_monitor", "machine_parts", "neutron_reflector", "iridium_neutron_reflector",
"thick_neutron_reflector", "electronic_circuit", "advanced_circuit", "sap", "rubber", "scrap",
"carbon_mesh", "carbon_fiber", "coolant_simple", "coolant_triple", "coolant_six" };
public ItemParts() {
setCreativeTab(TechRebornCreativeTab.instance);
setHasSubtypes(true);
setUnlocalizedName("techreborn.part");
this.setCreativeTab(TechRebornCreativeTab.instance);
this.setHasSubtypes(true);
this.setUnlocalizedName("techreborn.part");
}
public static ItemStack getPartByName(String name, int count) {
public static ItemStack getPartByName(String name, final int count) {
//TODO: Change all recipes n' shit to use proper snake_case names so I don't have to do this bullshit
if (name.equals("NaKCoolantSimple"))
name = "nak_coolant_simple";
@ -47,43 +49,44 @@ public class ItemParts extends ItemTRNoDestroy {
if (name.equals("rubberSap"))
name = "sap";
name = CaseFormat.LOWER_CAMEL.to(CaseFormat.LOWER_UNDERSCORE, name);
for (int i = 0; i < types.length; i++) {
if (types[i].equalsIgnoreCase(name)) {
for (int i = 0; i < ItemParts.types.length; i++) {
if (ItemParts.types[i].equalsIgnoreCase(name)) {
return new ItemStack(ModItems.PARTS, count, i);
}
}
throw new InvalidParameterException("The part " + name + " could not be found.");
}
public static ItemStack getPartByName(String name) {
return getPartByName(name, 1);
public static ItemStack getPartByName(final String name) {
return ItemParts.getPartByName(name, 1);
}
@Override
// gets Unlocalized Name depending on meta data
public String getUnlocalizedName(ItemStack itemStack) {
public String getUnlocalizedName(final ItemStack itemStack) {
int meta = itemStack.getItemDamage();
if (meta < 0 || meta >= types.length) {
if (meta < 0 || meta >= ItemParts.types.length) {
meta = 0;
}
return super.getUnlocalizedName() + "." + types[meta];
return super.getUnlocalizedName() + "." + ItemParts.types[meta];
}
// Adds Dusts SubItems To Creative Tab
public void getSubItems(Item item, CreativeTabs creativeTabs, NonNullList list) {
for (int meta = 0; meta < types.length; ++meta) {
if (!types[meta].equals(ModItems.META_PLACEHOLDER)) {
@Override
public void getSubItems(final Item item, final CreativeTabs creativeTabs, final NonNullList list) {
for (int meta = 0; meta < ItemParts.types.length; ++meta) {
if (!ItemParts.types[meta].equals(ModItems.META_PLACEHOLDER)) {
list.add(new ItemStack(item, 1, meta));
}
}
}
public ItemStack onItemRightClick(ItemStack itemStack, World world, EntityPlayer player) {
public ItemStack onItemRightClick(final ItemStack itemStack, final World world, final EntityPlayer player) {
switch (itemStack.getItemDamage()) {
case 37: // Destructo pack
player.openGui(Core.INSTANCE, GuiHandler.destructoPackID, world, (int) player.posX, (int) player.posY,
(int) player.posY);
player.openGui(Core.INSTANCE, EGui.DESTRUCTOPACK.ordinal(), world, (int) player.posX, (int) player.posY,
(int) player.posY);
break;
}
return itemStack;

View file

@ -17,7 +17,7 @@ import java.util.List;
public class ItemUpgrades extends ItemTRNoDestroy implements IMachineUpgrade {
public static final String[] types = new String[] { "overclock", "transformer", "energy_storage" };
public static final String[] types = new String[] { "overclock", "transformer", "energy_storage", "range" };
public ItemUpgrades() {
setUnlocalizedName("techreborn.upgrade");

View file

@ -8,8 +8,9 @@ import net.minecraft.util.EnumHand;
import net.minecraft.util.text.TextFormatting;
import net.minecraft.util.text.translation.I18n;
import net.minecraft.world.World;
import techreborn.Core;
import techreborn.client.GuiHandler;
import techreborn.client.EGui;
import techreborn.client.TechRebornCreativeTab;
import techreborn.items.ItemTRNoDestroy;
@ -18,21 +19,21 @@ import java.util.List;
public class ItemTechManual extends ItemTRNoDestroy {
public ItemTechManual() {
setCreativeTab(TechRebornCreativeTab.instance);
setUnlocalizedName("techreborn.manual");
setMaxStackSize(1);
this.setCreativeTab(TechRebornCreativeTab.instance);
this.setUnlocalizedName("techreborn.manual");
this.setMaxStackSize(1);
}
@Override
public ActionResult<ItemStack> onItemRightClick(World world, EntityPlayer player,
EnumHand hand) {
player.openGui(Core.INSTANCE, GuiHandler.manuelID, world, (int) player.posX, (int) player.posY,
(int) player.posY);
public ActionResult<ItemStack> onItemRightClick(final World world, final EntityPlayer player,
final EnumHand hand) {
player.openGui(Core.INSTANCE, EGui.MANUAL.ordinal(), world, (int) player.posX, (int) player.posY,
(int) player.posY);
return new ActionResult<>(EnumActionResult.SUCCESS, player.getHeldItem(hand));
}
@Override
public void addInformation(ItemStack stack, EntityPlayer playerIn, List<String> tooltip, boolean advanced) {
public void addInformation(final ItemStack stack, final EntityPlayer playerIn, final List<String> tooltip, final boolean advanced) {
tooltip.add(TextFormatting.RED + I18n.translateToLocal("tooltip.wip"));
}
}