Bunch of item work, 96

This commit is contained in:
modmuss50 2019-02-22 15:02:41 +00:00
parent 91994e5a01
commit fd0fa8c66e
27 changed files with 123 additions and 191 deletions

View file

@ -103,7 +103,13 @@ group = 'TechReborn'
dependencies { dependencies {
minecraft 'net.minecraftforge:forge:1.13.2-25.0.44' minecraft 'net.minecraftforge:forge:1.13.2-25.0.44'
if (findProject(':reborncore') != null) {
compile project(":reborncore")
} else {
compile 'RebornCore:RebornCore-1.13.2:+:dev' compile 'RebornCore:RebornCore-1.13.2:+:dev'
}
} }
processResources{ processResources{

View file

@ -41,22 +41,6 @@ public final class TechRebornAPI {
public static IC2Helper ic2Helper; public static IC2Helper ic2Helper;
public static void addRollingOreMachinceRecipe(ResourceLocation resourceLocation, ItemStack output, Object... components) {
RollingMachineRecipe.instance.addShapedOreRecipe(resourceLocation, output, components);
}
public static void addShapelessOreRollingMachinceRecipe(ResourceLocation resourceLocation, ItemStack output, Object... components) {
RollingMachineRecipe.instance.addShapelessOreRecipe(resourceLocation, output, components);
}
public static void addRollingMachinceRecipe(ResourceLocation resourceLocation, ItemStack output, Object... components) {
RollingMachineRecipe.instance.addRecipe(resourceLocation, output, components);
}
public static void addShapelessRollingMachinceRecipe(ResourceLocation resourceLocation, ItemStack output, Object... components) {
RollingMachineRecipe.instance.addShapelessRecipe(resourceLocation, output, components);
}
/** /**
* Use this to get an item from Tech Reborn, @see <a href= * Use this to get an item from Tech Reborn, @see <a href=
* "https://github.com/TechReborn/TechReborn/blob/1.9/src/main/java/techreborn/init/ModItems.java"> * "https://github.com/TechReborn/TechReborn/blob/1.9/src/main/java/techreborn/init/ModItems.java">

View file

@ -24,15 +24,14 @@
package techreborn.blocks; package techreborn.blocks;
import net.minecraft.block.Block;
import net.minecraft.block.BlockSapling; import net.minecraft.block.BlockSapling;
import net.minecraft.block.SoundType; import net.minecraft.block.SoundType;
import net.minecraft.block.material.Material;
import net.minecraft.block.state.IBlockState; import net.minecraft.block.state.IBlockState;
import net.minecraft.creativetab.CreativeTabs; import net.minecraft.block.trees.SpruceTree;
import net.minecraft.item.ItemStack;
import net.minecraft.util.NonNullList;
import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.BlockPos;
import net.minecraft.world.IWorld; import net.minecraft.world.IWorld;
import net.minecraft.world.World;
import techreborn.world.RubberTreeGenerator; import techreborn.world.RubberTreeGenerator;
import java.util.Random; import java.util.Random;
@ -43,8 +42,8 @@ import java.util.Random;
public class BlockRubberSapling extends BlockSapling { public class BlockRubberSapling extends BlockSapling {
public BlockRubberSapling() { public BlockRubberSapling() {
super(new SpruceTree(), Block.Properties.create(Material.PLANTS).sound(SoundType.PLANT));
this.setDefaultState(this.getDefaultState().with(STAGE, 0)); this.setDefaultState(this.getDefaultState().with(STAGE, 0));
setSoundType(SoundType.PLANT);
} }
@Override @Override
@ -52,15 +51,11 @@ public class BlockRubberSapling extends BlockSapling {
if (!net.minecraftforge.event.ForgeEventFactory.saplingGrowTree(worldIn, rand, pos)) { if (!net.minecraftforge.event.ForgeEventFactory.saplingGrowTree(worldIn, rand, pos)) {
return; return;
} }
worldIn.setBlockToAir(pos); worldIn.removeBlock(pos);
if (!new RubberTreeGenerator(false).growTree(worldIn, rand, pos.getX(), pos.getY(), pos.getZ())) { if (!new RubberTreeGenerator(false).growTree(worldIn, rand, pos.getX(), pos.getY(), pos.getZ())) {
worldIn.setBlockState(pos, state); // Re-add the sapling if the tree worldIn.setBlockState(pos, state, 3); // Re-add the sapling if the tree
// failed to grow // failed to grow
} }
} }
@Override
public void getSubBlocks(CreativeTabs tab, NonNullList<ItemStack> list) {
list.add(new ItemStack(this, 1, 0));
}
} }

View file

@ -1,69 +0,0 @@
/*
* This file is part of TechReborn, licensed under the MIT License (MIT).
*
* Copyright (c) 2018 TechReborn
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in all
* copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
* SOFTWARE.
*/
package techreborn.blocks;
import reborncore.common.registration.RebornRegister;
import reborncore.common.registration.config.ConfigRegistry;
import techreborn.TechReborn;
//This is in its own class as not to load the block class before
@RebornRegister(modID = TechReborn.MOD_ID, priority = 1, earlyReg = true)
public class OreBlockStateManager {
//This is a one off config, dont worry about it
@ConfigRegistry(config = "misc", category = "misc", key = "endOreStone", comment = "Set to true to render the end ores with a stone background")
public static boolean endOreStone = false;
public static String convert(String name){
if (OreBlockStateManager.endOreStone && name.equals("tungsten")) {
name = "tungsten_stone";
}
if (OreBlockStateManager.endOreStone && name.equals("peridot")) {
name = "peridot_stone";
}
if (OreBlockStateManager.endOreStone && name.equals("sheldonite")) {
name = "sheldonite_stone";
}
if (OreBlockStateManager.endOreStone && name.equals("sodalite")) {
name = "sodalite_stone";
}
return name;
}
public static String invert(String name){
if (name.equals("tungsten_stone")) {
name = "tungsten";
}
if (name.equals("peridot_stone")) {
name = "peridot";
}
if (name.equals("sheldonite_stone")) {
name = "sheldonite";
}
if (name.equals("sodalite_stone")) {
name = "sodalite";
}
return name;
}
}

View file

@ -90,11 +90,11 @@ public class BlockCable extends BlockContainer {
//see for more info https://www.reddit.com/r/feedthebeast/comments/5mxwq9/psa_mod_devs_do_you_call_worldgettileentity_from/ //see for more info https://www.reddit.com/r/feedthebeast/comments/5mxwq9/psa_mod_devs_do_you_call_worldgettileentity_from/
public TileEntity getTileEntitySafely(IWorld blockAccess, BlockPos pos) { public TileEntity getTileEntitySafely(IWorld blockAccess, BlockPos pos) {
if (blockAccess instanceof ChunkCache) { // if (blockAccess instanceof ChunkCache) {
return ((ChunkCache) blockAccess).getTileEntity(pos, Chunk.EnumCreateEntityType.CHECK); // return ((ChunkCache) blockAccess).getTileEntity(pos, Chunk.EnumCreateEntityType.CHECK);
} else { // } else {
return blockAccess.getTileEntity(pos); return blockAccess.getTileEntity(pos);
} // }
} }
public AbstractProperty<Boolean> getProperty(EnumFacing facing) { public AbstractProperty<Boolean> getProperty(EnumFacing facing) {
@ -147,6 +147,7 @@ public class BlockCable extends BlockContainer {
return super.onBlockActivated(state, worldIn, pos, playerIn, hand, side, hitX, hitY, hitZ); return super.onBlockActivated(state, worldIn, pos, playerIn, hand, side, hitX, hitY, hitZ);
} }
/*
@Override @Override
public boolean isOpaqueCube(IBlockState state) { public boolean isOpaqueCube(IBlockState state) {
@ -206,20 +207,20 @@ public class BlockCable extends BlockContainer {
} }
@Override @Override
public IBlockState getActualState(IBlockState state, IBlockAccess worldIn, BlockPos pos) { public IBlockState getActualState(IBlockState state, IWorld worldIn, BlockPos pos) {
IBlockState actualState = state; IBlockState actualState = state;
for (EnumFacing facing : EnumFacing.values()) { for (EnumFacing facing : EnumFacing.values()) {
TileEntity tileEntity = getTileEntitySafely(worldIn, pos.offset(facing)); TileEntity tileEntity = getTileEntitySafely(worldIn, pos.offset(facing));
if (tileEntity != null) { if (tileEntity != null) {
actualState = actualState.with(getProperty(facing), tileEntity.hasCapability(CapabilityEnergy.ENERGY, facing.getOpposite())); actualState = actualState.with(getProperty(facing), tileEntity.getCapability(CapabilityEnergy.ENERGY, facing.getOpposite()).isPresent());
} }
} }
return actualState; return actualState;
} }
@Override @Override
public void onEntityCollision(World worldIn, BlockPos pos, IBlockState state, Entity entity) { public void onEntityCollision(IBlockState state, World worldIn, BlockPos pos, Entity entity) {
super.onEntityCollision(worldIn, pos, state, entity); super.onEntityCollision(state, worldIn, pos, entity);
if (type.canKill && entity instanceof EntityLivingBase) { if (type.canKill && entity instanceof EntityLivingBase) {
TileEntity tileEntity = worldIn.getTileEntity(pos); TileEntity tileEntity = worldIn.getTileEntity(pos);
if (tileEntity != null && tileEntity instanceof TileCable) { if (tileEntity != null && tileEntity instanceof TileCable) {
@ -244,4 +245,6 @@ public class BlockCable extends BlockContainer {
} }
} }
} }
*/
} }

View file

@ -29,12 +29,7 @@ import java.util.Map;
import com.google.common.collect.Maps; import com.google.common.collect.Maps;
import net.minecraft.block.properties.IProperty;
import net.minecraft.block.state.IBlockState; import net.minecraft.block.state.IBlockState;
import net.minecraft.client.renderer.ItemMeshDefinition;
import net.minecraft.client.renderer.block.model.ModelResourceLocation;
import net.minecraft.client.renderer.block.statemap.DefaultStateMapper;
import net.minecraft.client.renderer.block.statemap.StateMapperBase;
import net.minecraft.item.Item; import net.minecraft.item.Item;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import net.minecraft.util.ResourceLocation; import net.minecraft.util.ResourceLocation;
@ -99,6 +94,8 @@ public class ModelRegistryEventHandler {
RebornModelRegistry.registerModel(new ModelCompound(TechReborn.MOD_ID, value.casing).setFileName("machine_block").setInvVariant("type=" + value.name + "_machine_casing")); RebornModelRegistry.registerModel(new ModelCompound(TechReborn.MOD_ID, value.casing).setFileName("machine_block").setInvVariant("type=" + value.name + "_machine_casing"));
} }
/*
ResourceLocation cableRL = new ResourceLocation(TechReborn.MOD_ID, "cable_inv"); ResourceLocation cableRL = new ResourceLocation(TechReborn.MOD_ID, "cable_inv");
for (Cables value : Cables.values()) { for (Cables value : Cables.values()) {
registerBlockstateMultiItem(cableRL, Item.getItemFromBlock(value.block), value.name); registerBlockstateMultiItem(cableRL, Item.getItemFromBlock(value.block), value.name);
@ -113,9 +110,13 @@ public class ModelRegistryEventHandler {
} }
}); });
} }
*/
} }
private static void registerFluidBlocks() { private static void registerFluidBlocks() {
/*
registerFluidBlockModel(ModFluids.BLOCK_BERYLLIUM); registerFluidBlockModel(ModFluids.BLOCK_BERYLLIUM);
registerFluidBlockModel(ModFluids.BLOCK_CALCIUM); registerFluidBlockModel(ModFluids.BLOCK_CALCIUM);
registerFluidBlockModel(ModFluids.BLOCK_CALCIUM_CARBONATE); registerFluidBlockModel(ModFluids.BLOCK_CALCIUM_CARBONATE);
@ -150,8 +151,10 @@ public class ModelRegistryEventHandler {
registerFluidBlockModel(ModFluids.BLOCK_SULFURIC_ACID); registerFluidBlockModel(ModFluids.BLOCK_SULFURIC_ACID);
registerFluidBlockModel(ModFluids.BLOCK_COMPRESSED_AIR); registerFluidBlockModel(ModFluids.BLOCK_COMPRESSED_AIR);
registerFluidBlockModel(ModFluids.BLOCK_ELECTROLYZED_WATER); registerFluidBlockModel(ModFluids.BLOCK_ELECTROLYZED_WATER);
*/
} }
private static void registerItems() { private static void registerItems() {
// Armor // Armor
register(TRContent.CLOAKING_DEVICE, "armor/cloaking_device"); register(TRContent.CLOAKING_DEVICE, "armor/cloaking_device");
@ -257,6 +260,8 @@ public class ModelRegistryEventHandler {
} }
/*
private static void registerFluidBlockModel(BlockFluidTechReborn block) { private static void registerFluidBlockModel(BlockFluidTechReborn block) {
String name = block.getTranslationKey().substring(5).toLowerCase(); String name = block.getTranslationKey().substring(5).toLowerCase();
Item item = Item.getItemFromBlock(block); Item item = Item.getItemFromBlock(block);
@ -278,12 +283,14 @@ public class ModelRegistryEventHandler {
}); });
} }
*/
private static void register(Item item, String modelPath) { private static void register(Item item, String modelPath) {
RebornModelRegistry.registerItemModel(item, modelPath); RebornModelRegistry.registerItemModel(item, modelPath);
} }
private static void registerBlockstateMultiItem(ResourceLocation RL, Item item, String variantName) { private static void registerBlockstateMultiItem(ResourceLocation RL, Item item, String variantName) {
ModelLoader.setCustomModelResourceLocation(item, 0, new ModelResourceLocation(RL, "type=" + variantName)); //ModelLoader.setCustomModelResourceLocation(item, 0, new ModelResourceLocation(RL, "type=" + variantName));
} }
} }

View file

@ -117,10 +117,7 @@ public class RegistryEventHandler {
RebornRegistry.registerBlock(TRContent.RUBBER_SAPLING = InitUtils.setup(new BlockRubberSapling(), "rubber_sapling"), RebornRegistry.registerBlock(TRContent.RUBBER_SAPLING = InitUtils.setup(new BlockRubberSapling(), "rubber_sapling"),
ItemBlockRubberSapling.class, ItemBlockRubberSapling.class,
"rubber_sapling"); "rubber_sapling");
RebornRegistry.registerBlockNoItem(TRContent.RUBBER_LOG_SLAB_HALF = InitUtils.setup(new BlockRubberPlankSlab.BlockHalf("rubber_plank"), "rubber_plank_slab")); RebornRegistry.registerBlockNoItem(TRContent.RUBBER_LOG_SLAB = InitUtils.setup(new BlockRubberPlankSlab("rubber_plank"), "rubber_plank_slab"));
RebornRegistry.registerBlock(TRContent.RUBBER_LOG_SLAB_DOUBLE = InitUtils.setup(new BlockRubberPlankSlab.BlockDouble("rubber_plank", TRContent.RUBBER_LOG_SLAB_HALF), "rubber_plank_double_slab"),
new ItemSlab(TRContent.RUBBER_LOG_SLAB_HALF, (BlockSlab) TRContent.RUBBER_LOG_SLAB_HALF, (BlockSlab) TRContent.RUBBER_LOG_SLAB_DOUBLE),
"rubber_plank_double_slab");
RebornRegistry.registerBlock(TRContent.RUBBER_LOG_STAIR = InitUtils.setup(new BlockRubberPlankStair(TRContent.RUBBER_LOG.getDefaultState(), "rubber_plank"), RebornRegistry.registerBlock(TRContent.RUBBER_LOG_STAIR = InitUtils.setup(new BlockRubberPlankStair(TRContent.RUBBER_LOG.getDefaultState(), "rubber_plank"),
"rubber_plank_stair"), new Item.Properties()); "rubber_plank_stair"), new Item.Properties());
@ -233,10 +230,10 @@ public class RegistryEventHandler {
TechReborn.LOGGER.debug("TechReborns Items Loaded"); TechReborn.LOGGER.debug("TechReborns Items Loaded");
} }
@SubscribeEvent(priority = EventPriority.LOW)//LOW is used as we want it to load as late as possible, but before crafttweaker // @SubscribeEvent(priority = EventPriority.LOW)//LOW is used as we want it to load as late as possible, but before crafttweaker
public static void registerRecipes(RegistryEvent.Register<IRecipe> event) { // public static void registerRecipes(RegistryEvent.Register<IRecipe> event) {
//Register ModRecipes // //Register ModRecipes
ModRecipes.init(); // ModRecipes.init();
} // }
} }

View file

@ -40,8 +40,7 @@ public class TRContent {
public static Block REINFORCED_GLASS; public static Block REINFORCED_GLASS;
public static Block RUBBER_LEAVES; public static Block RUBBER_LEAVES;
public static Block RUBBER_LOG; public static Block RUBBER_LOG;
public static Block RUBBER_LOG_SLAB_HALF; public static Block RUBBER_LOG_SLAB;
public static Block RUBBER_LOG_SLAB_DOUBLE;
public static Block RUBBER_LOG_STAIR; public static Block RUBBER_LOG_STAIR;
public static Block RUBBER_PLANKS; public static Block RUBBER_PLANKS;
public static Block RUBBER_SAPLING; public static Block RUBBER_SAPLING;

View file

@ -29,15 +29,14 @@ import net.minecraft.block.state.IBlockState;
import net.minecraft.enchantment.EnchantmentHelper; import net.minecraft.enchantment.EnchantmentHelper;
import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.EntityLivingBase;
import net.minecraft.init.Enchantments; import net.minecraft.init.Enchantments;
import net.minecraft.item.IItemPropertyGetter; import net.minecraft.item.*;
import net.minecraft.item.ItemAxe;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.util.ResourceLocation; import net.minecraft.util.ResourceLocation;
import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World; import net.minecraft.world.World;
import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.Dist;
import net.minecraftforge.api.distmarker.OnlyIn; import net.minecraftforge.api.distmarker.OnlyIn;
import net.minecraftforge.common.ToolType;
import net.minecraftforge.common.capabilities.ICapabilityProvider; import net.minecraftforge.common.capabilities.ICapabilityProvider;
import reborncore.api.power.IEnergyItemInfo; import reborncore.api.power.IEnergyItemInfo;
import reborncore.common.powerSystem.ExternalPowerSystems; import reborncore.common.powerSystem.ExternalPowerSystems;
@ -58,16 +57,15 @@ public class ItemChainsaw extends ItemAxe implements IEnergyItemInfo {
public int transferLimit = 100; public int transferLimit = 100;
public boolean isBreaking = false; public boolean isBreaking = false;
public ItemChainsaw(ToolMaterial material, int energyCapacity, float unpoweredSpeed) { public ItemChainsaw(ItemTier material, int energyCapacity, float unpoweredSpeed) {
super(material); super(material, (int) material.getAttackDamage(), unpoweredSpeed, new Item.Properties().maxStackSize(1));
setMaxStackSize(1);
this.maxCharge = energyCapacity; this.maxCharge = energyCapacity;
this.efficiency = unpoweredSpeed; this.efficiency = unpoweredSpeed;
this.addPropertyOverride(new ResourceLocation("techreborn", "animated"), new IItemPropertyGetter() { this.addPropertyOverride(new ResourceLocation("techreborn", "animated"), new IItemPropertyGetter() {
@Override @Override
@OnlyIn(Dist.CLIENT) @OnlyIn(Dist.CLIENT)
public float apply(ItemStack stack, @Nullable World worldIn, @Nullable EntityLivingBase entityIn) { public float call(ItemStack stack, @Nullable World worldIn, @Nullable EntityLivingBase entityIn) {
if (!stack.isEmpty() && new ForgePowerItemManager(stack).getEnergyStored() >= cost if (!stack.isEmpty() && new ForgePowerItemManager(stack).getEnergyStored() >= cost
&& entityIn != null && entityIn.getHeldItemMainhand().equals(stack)) { && entityIn != null && entityIn.getHeldItemMainhand().equals(stack)) {
return 1.0F; return 1.0F;
@ -81,7 +79,7 @@ public class ItemChainsaw extends ItemAxe implements IEnergyItemInfo {
@Override @Override
public float getDestroySpeed(ItemStack stack, IBlockState state) { public float getDestroySpeed(ItemStack stack, IBlockState state) {
if (new ForgePowerItemManager(stack).getEnergyStored() >= cost if (new ForgePowerItemManager(stack).getEnergyStored() >= cost
&& (state.getBlock().isToolEffective("axe", state) || state.getMaterial() == Material.WOOD)) { && (state.getBlock().isToolEffective(state, ToolType.AXE) || state.getMaterial() == Material.WOOD)) {
return this.poweredSpeed; return this.poweredSpeed;
} else { } else {
return super.getDestroySpeed(stack, state); return super.getDestroySpeed(stack, state);

View file

@ -29,6 +29,8 @@ import net.minecraft.enchantment.EnchantmentHelper;
import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.EntityLivingBase;
import net.minecraft.init.Enchantments; import net.minecraft.init.Enchantments;
import net.minecraft.init.Items; import net.minecraft.init.Items;
import net.minecraft.item.IItemTier;
import net.minecraft.item.Item;
import net.minecraft.item.ItemPickaxe; import net.minecraft.item.ItemPickaxe;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagCompound;
@ -52,10 +54,9 @@ public class ItemDrill extends ItemPickaxe implements IEnergyItemInfo {
public float unpoweredSpeed = 2.0F; public float unpoweredSpeed = 2.0F;
public int transferLimit = 100; public int transferLimit = 100;
public ItemDrill(ToolMaterial material, int energyCapacity, float unpoweredSpeed, float efficiencyOnProperMaterial) { public ItemDrill(IItemTier material, int energyCapacity, float unpoweredSpeed, float efficiencyOnProperMaterial) {
super(material); super(material, (int) material.getAttackDamage(), unpoweredSpeed, new Item.Properties().maxStackSize(1));
this.efficiency = efficiencyOnProperMaterial; this.efficiency = efficiencyOnProperMaterial;
setMaxStackSize(1);
this.maxCharge = energyCapacity; this.maxCharge = energyCapacity;
this.unpoweredSpeed = unpoweredSpeed; this.unpoweredSpeed = unpoweredSpeed;
} }

View file

@ -30,8 +30,10 @@ import net.minecraft.enchantment.EnchantmentHelper;
import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.EntityLivingBase;
import net.minecraft.init.Blocks; import net.minecraft.init.Blocks;
import net.minecraft.init.Enchantments; import net.minecraft.init.Enchantments;
import net.minecraft.item.Item;
import net.minecraft.item.ItemPickaxe; import net.minecraft.item.ItemPickaxe;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import net.minecraft.item.ItemTier;
import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World; import net.minecraft.world.World;
@ -53,11 +55,9 @@ public class ItemJackhammer extends ItemPickaxe implements IEnergyItemInfo {
public int cost = 250; public int cost = 250;
public int transferLimit = 100; public int transferLimit = 100;
public ItemJackhammer(ToolMaterial material, int energyCapacity) { public ItemJackhammer(ItemTier material, int energyCapacity) {
super(material); super(material, (int) material.getAttackDamage(), 1f, new Item.Properties().maxStackSize(1));
efficiency = 20F; efficiency = 20F;
setMaxStackSize(1);
setMaxDamage(240);
this.maxCharge = energyCapacity; this.maxCharge = energyCapacity;
} }
@ -92,7 +92,7 @@ public class ItemJackhammer extends ItemPickaxe implements IEnergyItemInfo {
// Item // Item
@Override @Override
public boolean canHarvestBlock(final IBlockState state, final ItemStack stack) { public boolean canHarvestBlock( final ItemStack stack, final IBlockState state) {
return TagUtils.isOre(state, "stone") return TagUtils.isOre(state, "stone")
|| state.getMaterial() == Material.ROCK && new ForgePowerItemManager(stack).getEnergyStored() >= cost; || state.getMaterial() == Material.ROCK && new ForgePowerItemManager(stack).getEnergyStored() >= cost;
} }

View file

@ -25,8 +25,8 @@
package techreborn.items.tool.advanced; package techreborn.items.tool.advanced;
import net.minecraft.block.state.IBlockState; import net.minecraft.block.state.IBlockState;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.init.Items; import net.minecraft.init.Items;
import net.minecraft.item.ItemGroup;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import net.minecraft.util.NonNullList; import net.minecraft.util.NonNullList;
import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.Dist;
@ -47,8 +47,8 @@ public class ItemAdvancedChainsaw extends ItemChainsaw {
@OnlyIn(Dist.CLIENT) @OnlyIn(Dist.CLIENT)
@Override @Override
public void getSubItems(CreativeTabs par2CreativeTabs, NonNullList<ItemStack> itemList) { public void fillItemGroup(ItemGroup par2ItemGroup, NonNullList<ItemStack> itemList) {
if (!isInCreativeTab(par2CreativeTabs)) { if (!isInGroup(par2ItemGroup)) {
return; return;
} }
ItemStack stack = new ItemStack(TRContent.ADVANCED_CHAINSAW); ItemStack stack = new ItemStack(TRContent.ADVANCED_CHAINSAW);

View file

@ -25,7 +25,7 @@
package techreborn.items.tool.advanced; package techreborn.items.tool.advanced;
import net.minecraft.block.state.IBlockState; import net.minecraft.block.state.IBlockState;
import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.ItemGroup;
import net.minecraft.init.Items; import net.minecraft.init.Items;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import net.minecraft.util.NonNullList; import net.minecraft.util.NonNullList;
@ -47,8 +47,8 @@ public class ItemAdvancedDrill extends ItemDrill {
@OnlyIn(Dist.CLIENT) @OnlyIn(Dist.CLIENT)
@Override @Override
public void getSubItems(CreativeTabs par2CreativeTabs, NonNullList<ItemStack> itemList) { public void fillItemGroup(ItemGroup par2ItemGroup, NonNullList<ItemStack> itemList) {
if (!isInCreativeTab(par2CreativeTabs)) { if (!isInGroup(par2ItemGroup)) {
return; return;
} }
ItemStack stack = new ItemStack(TRContent.ADVANCED_DRILL); ItemStack stack = new ItemStack(TRContent.ADVANCED_DRILL);

View file

@ -24,7 +24,7 @@
package techreborn.items.tool.advanced; package techreborn.items.tool.advanced;
import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.ItemGroup;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import net.minecraft.util.NonNullList; import net.minecraft.util.NonNullList;
import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.Dist;
@ -46,8 +46,8 @@ public class ItemAdvancedJackhammer extends ItemJackhammer {
@OnlyIn(Dist.CLIENT) @OnlyIn(Dist.CLIENT)
@Override @Override
public void getSubItems(CreativeTabs par2CreativeTabs, NonNullList<ItemStack> itemList) { public void fillItemGroup(ItemGroup par2ItemGroup, NonNullList<ItemStack> itemList) {
if (!isInCreativeTab(par2CreativeTabs)) { if (!isInGroup(par2ItemGroup)) {
return; return;
} }
ItemStack stack = new ItemStack(TRContent.ADVANCED_JACKHAMMER); ItemStack stack = new ItemStack(TRContent.ADVANCED_JACKHAMMER);

View file

@ -25,7 +25,7 @@
package techreborn.items.tool.advanced; package techreborn.items.tool.advanced;
import net.minecraft.block.state.IBlockState; import net.minecraft.block.state.IBlockState;
import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.ItemGroup;
import net.minecraft.enchantment.EnchantmentHelper; import net.minecraft.enchantment.EnchantmentHelper;
import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayer;
@ -145,8 +145,8 @@ public class ItemRockCutter extends ItemPickaxe implements IEnergyItemInfo {
@OnlyIn(Dist.CLIENT) @OnlyIn(Dist.CLIENT)
@Override @Override
public void getSubItems(CreativeTabs par2CreativeTabs, NonNullList<ItemStack> itemList) { public void fillItemGroup(ItemGroup par2ItemGroup, NonNullList<ItemStack> itemList) {
if (!isInCreativeTab(par2CreativeTabs)) { if (!isInGroup(par2ItemGroup)) {
return; return;
} }
ItemStack uncharged = new ItemStack(this); ItemStack uncharged = new ItemStack(this);

View file

@ -25,7 +25,7 @@
package techreborn.items.tool.basic; package techreborn.items.tool.basic;
import net.minecraft.block.state.IBlockState; import net.minecraft.block.state.IBlockState;
import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.ItemGroup;
import net.minecraft.init.Items; import net.minecraft.init.Items;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import net.minecraft.util.NonNullList; import net.minecraft.util.NonNullList;
@ -45,9 +45,8 @@ public class ItemBasicChainsaw extends ItemChainsaw {
@OnlyIn(Dist.CLIENT) @OnlyIn(Dist.CLIENT)
@Override @Override
public void getSubItems( public void fillItemGroup(ItemGroup par2ItemGroup, NonNullList<ItemStack> itemList) {
CreativeTabs par2CreativeTabs, NonNullList<ItemStack> itemList) { if (!isInGroup(par2ItemGroup)) {
if (!isInCreativeTab(par2CreativeTabs)) {
return; return;
} }
ItemStack stack = new ItemStack(TRContent.BASIC_CHAINSAW); ItemStack stack = new ItemStack(TRContent.BASIC_CHAINSAW);

View file

@ -25,12 +25,14 @@
package techreborn.items.tool.basic; package techreborn.items.tool.basic;
import net.minecraft.block.state.IBlockState; import net.minecraft.block.state.IBlockState;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.init.Items; import net.minecraft.init.Items;
import net.minecraft.item.ItemGroup;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import net.minecraft.item.ItemTier;
import net.minecraft.util.NonNullList; import net.minecraft.util.NonNullList;
import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.Dist;
import net.minecraftforge.api.distmarker.OnlyIn; import net.minecraftforge.api.distmarker.OnlyIn;
import net.minecraftforge.common.ToolType;
import reborncore.common.powerSystem.forge.ForgePowerItemManager; import reborncore.common.powerSystem.forge.ForgePowerItemManager;
import techreborn.config.ConfigTechReborn; import techreborn.config.ConfigTechReborn;
import techreborn.init.TRContent; import techreborn.init.TRContent;
@ -39,15 +41,14 @@ import techreborn.items.tool.ItemDrill;
public class ItemBasicDrill extends ItemDrill { public class ItemBasicDrill extends ItemDrill {
public ItemBasicDrill() { public ItemBasicDrill() {
super(ToolMaterial.IRON, ConfigTechReborn.BasicDrillCharge, 0.5F, 10F); super(ItemTier.IRON, ConfigTechReborn.BasicDrillCharge, 0.5F, 10F);
this.cost = 50; this.cost = 50;
} }
@OnlyIn(Dist.CLIENT) @OnlyIn(Dist.CLIENT)
@Override @Override
public void getSubItems( public void fillItemGroup(ItemGroup par2ItemGroup, NonNullList<ItemStack> itemList) {
CreativeTabs par2CreativeTabs, NonNullList<ItemStack> itemList) { if (!isInGroup(par2ItemGroup)) {
if (!isInCreativeTab(par2CreativeTabs)) {
return; return;
} }
ItemStack stack = new ItemStack(TRContent.BASIC_DRILL); ItemStack stack = new ItemStack(TRContent.BASIC_DRILL);

View file

@ -24,7 +24,7 @@
package techreborn.items.tool.basic; package techreborn.items.tool.basic;
import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.ItemGroup;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import net.minecraft.util.NonNullList; import net.minecraft.util.NonNullList;
import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.Dist;
@ -44,8 +44,8 @@ public class ItemBasicJackhammer extends ItemJackhammer {
@OnlyIn(Dist.CLIENT) @OnlyIn(Dist.CLIENT)
@Override @Override
public void getSubItems(CreativeTabs par2CreativeTabs, NonNullList<ItemStack> itemList) { public void fillItemGroup(ItemGroup par2ItemGroup, NonNullList<ItemStack> itemList) {
if (!isInCreativeTab(par2CreativeTabs)) { if (!isInGroup(par2ItemGroup)) {
return; return;
} }
ItemStack stack = new ItemStack(TRContent.BASIC_JACKHAMMER); ItemStack stack = new ItemStack(TRContent.BASIC_JACKHAMMER);

View file

@ -25,7 +25,7 @@
package techreborn.items.tool.basic; package techreborn.items.tool.basic;
import net.minecraft.block.state.IBlockState; import net.minecraft.block.state.IBlockState;
import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.ItemGroup;
import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.Item; import net.minecraft.item.Item;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
@ -101,8 +101,8 @@ public class ItemElectricTreetap extends Item implements IEnergyItemInfo {
@OnlyIn(Dist.CLIENT) @OnlyIn(Dist.CLIENT)
@Override @Override
public void getSubItems(CreativeTabs par2CreativeTabs, NonNullList<ItemStack> itemList) { public void fillItemGroup(ItemGroup par2ItemGroup, NonNullList<ItemStack> itemList) {
if (!isInCreativeTab(par2CreativeTabs)) { if (!isInGroup(par2ItemGroup)) {
return; return;
} }
ItemStack uncharged = new ItemStack(TRContent.ELECTRIC_TREE_TAP); ItemStack uncharged = new ItemStack(TRContent.ELECTRIC_TREE_TAP);

View file

@ -25,10 +25,11 @@
package techreborn.items.tool.industrial; package techreborn.items.tool.industrial;
import net.minecraft.block.state.IBlockState; import net.minecraft.block.state.IBlockState;
import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.ItemGroup;
import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.init.Items; import net.minecraft.init.Items;
import net.minecraft.item.ItemGroup;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import net.minecraft.util.NonNullList; import net.minecraft.util.NonNullList;
import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.BlockPos;
@ -52,8 +53,8 @@ public class ItemIndustrialChainsaw extends ItemChainsaw {
@OnlyIn(Dist.CLIENT) @OnlyIn(Dist.CLIENT)
@Override @Override
public void getSubItems(CreativeTabs par2CreativeTabs, NonNullList<ItemStack> itemList) { public void fillItemGroup(ItemGroup par2ItemGroup, NonNullList<ItemStack> itemList) {
if (!isInCreativeTab(par2CreativeTabs)) { if (!isInGroup(par2ItemGroup)) {
return; return;
} }
ItemStack stack = new ItemStack(TRContent.ADVANCED_CHAINSAW); ItemStack stack = new ItemStack(TRContent.ADVANCED_CHAINSAW);

View file

@ -26,7 +26,7 @@ package techreborn.items.tool.industrial;
import net.minecraft.block.material.Material; import net.minecraft.block.material.Material;
import net.minecraft.block.state.IBlockState; import net.minecraft.block.state.IBlockState;
import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.ItemGroup;
import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.init.Items; import net.minecraft.init.Items;
@ -157,8 +157,8 @@ public class ItemIndustrialDrill extends ItemDrill {
// Item // Item
@OnlyIn(Dist.CLIENT) @OnlyIn(Dist.CLIENT)
@Override @Override
public void getSubItems(CreativeTabs par2CreativeTabs, NonNullList<ItemStack> itemList) { public void fillItemGroup(ItemGroup par2ItemGroup, NonNullList<ItemStack> itemList) {
if (!isInCreativeTab(par2CreativeTabs)) { if (!isInGroup(par2ItemGroup)) {
return; return;
} }
ItemStack stack = new ItemStack(TRContent.ADVANCED_DRILL); ItemStack stack = new ItemStack(TRContent.ADVANCED_DRILL);

View file

@ -24,7 +24,7 @@
package techreborn.items.tool.industrial; package techreborn.items.tool.industrial;
import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.ItemGroup;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import net.minecraft.util.NonNullList; import net.minecraft.util.NonNullList;
import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.Dist;
@ -46,9 +46,9 @@ public class ItemIndustrialJackhammer extends ItemJackhammer {
@OnlyIn(Dist.CLIENT) @OnlyIn(Dist.CLIENT)
@Override @Override
public void getSubItems( public void fillItemGroup(
CreativeTabs par2CreativeTabs, NonNullList<ItemStack> itemList) { ItemGroup par2ItemGroup, NonNullList<ItemStack> itemList) {
if (!isInCreativeTab(par2CreativeTabs)) { if (!isInGroup(par2ItemGroup)) {
return; return;
} }
ItemStack stack = new ItemStack(TRContent.ADVANCED_JACKHAMMER); ItemStack stack = new ItemStack(TRContent.ADVANCED_JACKHAMMER);

View file

@ -28,7 +28,7 @@ import com.google.common.collect.HashMultimap;
import com.google.common.collect.Multimap; import com.google.common.collect.Multimap;
import net.minecraft.client.resources.I18n; import net.minecraft.client.resources.I18n;
import net.minecraft.client.util.ITooltipFlag; import net.minecraft.client.util.ITooltipFlag;
import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.ItemGroup;
import net.minecraft.entity.Entity; import net.minecraft.entity.Entity;
import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.SharedMonsterAttributes; import net.minecraft.entity.SharedMonsterAttributes;
@ -203,9 +203,9 @@ public class ItemNanosaber extends ItemSword implements IEnergyItemInfo {
@OnlyIn(Dist.CLIENT) @OnlyIn(Dist.CLIENT)
@Override @Override
public void getSubItems( public void fillItemGroup(
CreativeTabs par2CreativeTabs, NonNullList<ItemStack> itemList) { ItemGroup par2ItemGroup, NonNullList<ItemStack> itemList) {
if (!isInCreativeTab(par2CreativeTabs)) { if (!isInGroup(par2ItemGroup)) {
return; return;
} }
ItemStack inactiveUncharged = new ItemStack(this); ItemStack inactiveUncharged = new ItemStack(this);

View file

@ -26,7 +26,7 @@ package techreborn.items.tool.industrial;
import net.minecraft.block.state.IBlockState; import net.minecraft.block.state.IBlockState;
import net.minecraft.client.util.ITooltipFlag; import net.minecraft.client.util.ITooltipFlag;
import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.ItemGroup;
import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.init.Items; import net.minecraft.init.Items;
@ -164,9 +164,9 @@ public class ItemOmniTool extends ItemPickaxe implements IEnergyItemInfo {
@OnlyIn(Dist.CLIENT) @OnlyIn(Dist.CLIENT)
@Override @Override
public void getSubItems( public void fillItemGroup(
CreativeTabs par2CreativeTabs, NonNullList<ItemStack> itemList) { ItemGroup par2ItemGroup, NonNullList<ItemStack> itemList) {
if (!isInCreativeTab(par2CreativeTabs)) { if (!isInGroup(par2ItemGroup)) {
return; return;
} }
ItemStack uncharged = new ItemStack(TRContent.OMNI_TOOL); ItemStack uncharged = new ItemStack(TRContent.OMNI_TOOL);

View file

@ -71,8 +71,8 @@ public class ClientProxy extends CommonProxy {
MinecraftForge.EVENT_BUS.register(GuiFluidConfiguration.class); MinecraftForge.EVENT_BUS.register(GuiFluidConfiguration.class);
// TODO FIX ME // TODO FIX ME
ClientRegistry.registerKeyBinding(KeyBindings.config); ClientRegistry.registerKeyBinding(KeyBindings.config);
StateMap rubberLeavesStateMap = new StateMap.Builder().ignore(BlockRubberLeaves.CHECK_DECAY, BlockRubberLeaves.DECAYABLE).build(); // StateMap rubberLeavesStateMap = new StateMap.Builder().ignore(BlockRubberLeaves.CHECK_DECAY, BlockRubberLeaves.DECAYABLE).build();
ModelLoader.setCustomStateMapper(TRContent.RUBBER_LEAVES, rubberLeavesStateMap); // ModelLoader.setCustomStateMapper(TRContent.RUBBER_LEAVES, rubberLeavesStateMap);
GuiBase.wrenchStack = new ItemStack(TRContent.WRENCH); GuiBase.wrenchStack = new ItemStack(TRContent.WRENCH);
GuiBase.fluidCellProvider = DynamicCell::getCellWithFluid; GuiBase.fluidCellProvider = DynamicCell::getCellWithFluid;
} }

View file

@ -86,7 +86,7 @@ public class TileLightningRod extends TilePowerAcceptor implements IToolDrop {
} }
final EntityLightningBolt lightningBolt = new EntityLightningBolt(world, final EntityLightningBolt lightningBolt = new EntityLightningBolt(world,
pos.getX() + 0.5F, pos.getX() + 0.5F,
world.provider.getAverageGroundLevel(), world.getHeight(),
pos.getZ() + 0.5F, false); pos.getZ() + 0.5F, false);
world.addWeatherEffect(lightningBolt); world.addWeatherEffect(lightningBolt);
world.spawnEntity(lightningBolt); world.spawnEntity(lightningBolt);
@ -99,8 +99,8 @@ public class TileLightningRod extends TilePowerAcceptor implements IToolDrop {
} }
public float getLightningStrikeMultiplier() { public float getLightningStrikeMultiplier() {
final float actualHeight = world.provider.getActualHeight(); final float actualHeight = world.getDimension().getActualHeight();
final float groundLevel = world.provider.getAverageGroundLevel(); final float groundLevel = world.getHeight();
for (int i = pos.getY() + 1; i < actualHeight; i++) { for (int i = pos.getY() + 1; i < actualHeight; i++) {
if (!isValidIronFence(i)) { if (!isValidIronFence(i)) {
if (groundLevel >= i) if (groundLevel >= i)

View file

@ -26,12 +26,15 @@ package techreborn.world;
import net.minecraft.block.Block; import net.minecraft.block.Block;
import net.minecraft.block.state.IBlockState; import net.minecraft.block.state.IBlockState;
import net.minecraft.block.trees.AbstractTree;
import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumFacing;
import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.BlockPos;
import net.minecraft.world.IWorld; import net.minecraft.world.IWorld;
import net.minecraft.world.World; import net.minecraft.world.World;
import net.minecraft.world.chunk.IChunkProvider; import net.minecraft.world.chunk.IChunkProvider;
import net.minecraft.world.gen.IChunkGenerator; import net.minecraft.world.gen.IChunkGenerator;
import net.minecraft.world.gen.feature.AbstractTreeFeature;
import net.minecraft.world.gen.feature.NoFeatureConfig;
import net.minecraft.world.gen.feature.WorldGenerator; import net.minecraft.world.gen.feature.WorldGenerator;
import net.minecraftforge.common.IPlantable; import net.minecraftforge.common.IPlantable;
import net.minecraftforge.fml.common.IWorldGenerator; import net.minecraftforge.fml.common.IWorldGenerator;
@ -40,9 +43,10 @@ import techreborn.blocks.BlockRubberLeaves;
import techreborn.blocks.BlockRubberLog; import techreborn.blocks.BlockRubberLog;
import techreborn.init.TRContent; import techreborn.init.TRContent;
import javax.annotation.Nullable;
import java.util.Random; import java.util.Random;
public class RubberTreeGenerator implements IWorldGenerator { public class RubberTreeGenerator extends AbstractTree implements IWorldGenerator {
boolean isWorldGen = true; boolean isWorldGen = true;
@ -50,6 +54,12 @@ public class RubberTreeGenerator implements IWorldGenerator {
super(); super();
} }
@Nullable
@Override
protected AbstractTreeFeature<NoFeatureConfig> getTreeFeature(Random random) {
return null;
}
public RubberTreeGenerator(boolean isWorldGen) { public RubberTreeGenerator(boolean isWorldGen) {
super(!isWorldGen); super(!isWorldGen);
this.isWorldGen = isWorldGen; this.isWorldGen = isWorldGen;