Moved items into content

This commit is contained in:
drcrazy 2018-09-24 14:28:58 +03:00
parent bf7f7ba871
commit 9f9595f955
40 changed files with 519 additions and 582 deletions

View file

@ -38,7 +38,6 @@ import reborncore.common.registration.impl.ConfigRegistry;
import reborncore.common.util.OreDrop;
import techreborn.TechReborn;
import techreborn.init.TRContent;
import techreborn.init.TRItems;
import techreborn.utils.OreDictUtils;
import java.util.List;
@ -91,7 +90,7 @@ public class BlockBreakHandler {
@SubscribeEvent
public void getBreakSpeedEvent(PlayerEvent.BreakSpeed event){
if(event.getEntityPlayer().getHeldItem(EnumHand.MAIN_HAND).getItem() == TRItems.INDUSTRIAL_CHAINSAW && event.getOriginalSpeed() > 1.0f){
if(event.getEntityPlayer().getHeldItem(EnumHand.MAIN_HAND).getItem() == TRContent.INDUSTRIAL_CHAINSAW && event.getOriginalSpeed() > 1.0f){
BlockPos pos = event.getPos();
World worldIn = event.getEntityPlayer().world;
float speed = 20F;

View file

@ -35,8 +35,6 @@ import net.minecraftforge.registries.IForgeRegistryEntry;
import reborncore.common.util.ItemUtils;
import techreborn.TechReborn;
import techreborn.init.TRContent;
import techreborn.init.TRItems;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
@ -58,7 +56,7 @@ public class TRRecipeHandler {
if (entityItemPickupEvent.getEntityPlayer() instanceof EntityPlayerMP) {
if (ItemUtils.isInputEqual("logWood", entityItemPickupEvent.getItem().getItem(), false, false, true)) {
for (IRecipe recipe : CraftingManager.REGISTRY) {
if (recipe.getRecipeOutput().getItem() == TRItems.TREE_TAP) {
if (recipe.getRecipeOutput().getItem() == TRContent.TREE_TAP) {
entityItemPickupEvent.getEntityPlayer().unlockRecipes(Collections.singletonList(recipe));
}
}

View file

@ -31,7 +31,7 @@ import net.minecraft.item.Item;
import net.minecraftforge.fml.common.eventhandler.EventPriority;
import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
import net.minecraftforge.fml.common.gameevent.TickEvent;
import techreborn.init.TRItems;
import techreborn.init.TRContent;
public class TRTickHandler {
@ -43,7 +43,7 @@ public class TRTickHandler {
Item chestslot = !player.getItemStackFromSlot(EntityEquipmentSlot.CHEST).isEmpty()
? player.getItemStackFromSlot(EntityEquipmentSlot.CHEST).getItem() : null;
if (previouslyWearing != chestslot && previouslyWearing == TRItems.CLOAKING_DEVICE && player.isInvisible()
if (previouslyWearing != chestslot && previouslyWearing == TRContent.CLOAKING_DEVICE && player.isInvisible()
&& !player.isPotionActive(MobEffects.INVISIBILITY)) {
player.setInvisible(false);
}