1147 - Initial auto mappings pass
This commit is contained in:
parent
48198dbcb3
commit
4e03ac893c
291 changed files with 3335 additions and 3504 deletions
|
@ -24,14 +24,14 @@
|
|||
|
||||
package techreborn.utils;
|
||||
|
||||
import net.minecraft.block.BlockDispenser;
|
||||
import net.minecraft.dispenser.BehaviorDefaultDispenseItem;
|
||||
import net.minecraft.dispenser.IBlockSource;
|
||||
import net.minecraft.dispenser.IPosition;
|
||||
import net.minecraft.block.DispenserBlock;
|
||||
import net.minecraft.block.dispenser.ItemDispenserBehavior;
|
||||
import net.minecraft.block.entity.DispenserBlockEntity;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.tileentity.TileEntityDispenser;
|
||||
import net.minecraft.util.EnumFacing;
|
||||
import net.minecraft.util.math.BlockPointer;
|
||||
import net.minecraft.util.math.BlockPos;
|
||||
import net.minecraft.util.math.Direction;
|
||||
import net.minecraft.util.math.Position;
|
||||
import reborncore.common.crafting.Recipe;
|
||||
import reborncore.common.registration.RebornRegister;
|
||||
import reborncore.common.registration.config.ConfigRegistry;
|
||||
|
@ -42,23 +42,23 @@ import java.util.List;
|
|||
import java.util.Random;
|
||||
|
||||
@RebornRegister(TechReborn.MOD_ID)
|
||||
public class BehaviorDispenseScrapbox extends BehaviorDefaultDispenseItem {
|
||||
public class BehaviorDispenseScrapbox extends ItemDispenserBehavior {
|
||||
|
||||
@ConfigRegistry(config = "misc", category = "general", key = "DispenserScrapbox", comment = "Dispensers will open scrapboxes")
|
||||
public static boolean dispenseScrapboxes = true;
|
||||
|
||||
@Override
|
||||
protected ItemStack dispenseStack(IBlockSource source, ItemStack stack) {
|
||||
protected ItemStack dispenseStack(BlockPointer source, ItemStack stack) {
|
||||
if (dispenseScrapboxes) {
|
||||
List<Recipe> scrapboxRecipeList = ModRecipes.SCRAPBOX.getRecipes(source.getWorld());
|
||||
int random = new Random().nextInt(scrapboxRecipeList.size());
|
||||
ItemStack out = scrapboxRecipeList.get(random).getOutputs().get(0);
|
||||
stack.split(1);
|
||||
|
||||
TileEntityDispenser tile = source.getBlockTileEntity();
|
||||
EnumFacing enumfacing = tile.getWorld().getBlockState(new BlockPos(source.getX(), source.getY(), source.getZ())).get(BlockDispenser.FACING);
|
||||
IPosition iposition = BlockDispenser.getDispensePosition(source);
|
||||
doDispense(source.getWorld(), out, 6, enumfacing, iposition);
|
||||
DispenserBlockEntity tile = source.getBlockEntity();
|
||||
Direction enumfacing = tile.getWorld().getBlockState(new BlockPos(source.getX(), source.getY(), source.getZ())).get(DispenserBlock.FACING);
|
||||
Position iposition = DispenserBlock.getOutputLocation(source);
|
||||
dispenseItem(source.getWorld(), out, 6, enumfacing, iposition);
|
||||
}
|
||||
return stack;
|
||||
}
|
||||
|
|
|
@ -25,7 +25,7 @@
|
|||
package techreborn.utils;
|
||||
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraftforge.fluids.Fluid;
|
||||
|
||||
|
||||
import java.util.Collections;
|
||||
import java.util.List;
|
||||
|
|
|
@ -26,17 +26,17 @@ package techreborn.utils;
|
|||
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.util.ResourceLocation;
|
||||
import net.minecraft.util.Identifier;
|
||||
import techreborn.TechReborn;
|
||||
|
||||
public class InitUtils {
|
||||
public static <I extends Item> I setup(I item, String name) {
|
||||
item.setRegistryName(new ResourceLocation(TechReborn.MOD_ID, name));
|
||||
item.setRegistryName(new Identifier(TechReborn.MOD_ID, name));
|
||||
return item;
|
||||
}
|
||||
|
||||
public static <B extends Block> B setup(B block, String name) {
|
||||
block.setRegistryName(new ResourceLocation(TechReborn.MOD_ID, name));
|
||||
block.setRegistryName(new Identifier(TechReborn.MOD_ID, name));
|
||||
return block;
|
||||
}
|
||||
}
|
||||
|
|
|
@ -24,17 +24,17 @@
|
|||
|
||||
package techreborn.utils;
|
||||
|
||||
import net.minecraft.ChatFormat;
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.init.Items;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.nbt.NBTTagCompound;
|
||||
import net.minecraft.nbt.NBTTagString;
|
||||
import net.minecraft.util.text.TextComponentString;
|
||||
import net.minecraft.util.text.TextFormatting;
|
||||
import net.minecraftforge.api.distmarker.Dist;
|
||||
import net.minecraftforge.api.distmarker.OnlyIn;
|
||||
import net.minecraftforge.event.entity.player.ItemTooltipEvent;
|
||||
import net.minecraftforge.eventbus.api.SubscribeEvent;
|
||||
import net.minecraft.item.Items;
|
||||
import net.minecraft.nbt.CompoundTag;
|
||||
import net.minecraft.nbt.StringTag;
|
||||
import net.minecraft.network.chat.TextComponent;
|
||||
import net.fabricmc.api.EnvType;
|
||||
import net.fabricmc.api.Environment;
|
||||
|
||||
|
||||
import reborncore.common.util.StringUtils;
|
||||
import techreborn.init.TRContent;
|
||||
|
||||
|
@ -60,21 +60,21 @@ public class StackWIPHandler {
|
|||
|
||||
private void addHead(String name) {
|
||||
ItemStack head = new ItemStack(Items.PLAYER_HEAD, 3);
|
||||
head.setTag(new NBTTagCompound());
|
||||
head.getTag().put("SkullOwner", new NBTTagString(name));
|
||||
head.setTag(new CompoundTag());
|
||||
head.getTag().put("SkullOwner", new StringTag(name));
|
||||
devHeads.add(head);
|
||||
}
|
||||
|
||||
@OnlyIn(Dist.CLIENT)
|
||||
@Environment(EnvType.CLIENT)
|
||||
@SubscribeEvent
|
||||
public void toolTip(ItemTooltipEvent event) {
|
||||
Block block = Block.getBlockFromItem(event.getItemStack().getItem());
|
||||
if (block != null && wipBlocks.contains(block)) {
|
||||
event.getToolTip().add(new TextComponentString(TextFormatting.RED + StringUtils.t("techreborn.tooltip.wip")));
|
||||
event.getToolTip().add(new TextComponent(ChatFormat.RED + StringUtils.t("techreborn.tooltip.wip")));
|
||||
}
|
||||
|
||||
if (devHeads.contains(event.getItemStack())) {
|
||||
event.getToolTip().add(new TextComponentString(TextFormatting.GOLD + "TechReborn Developer"));
|
||||
event.getToolTip().add(new TextComponent(ChatFormat.GOLD + "TechReborn Developer"));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -25,12 +25,12 @@
|
|||
package techreborn.utils;
|
||||
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.block.state.IBlockState;
|
||||
import net.minecraft.block.BlockState;
|
||||
import net.minecraft.fluid.Fluid;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.tags.Tag;
|
||||
import net.minecraft.tags.TagCollection;
|
||||
import net.minecraft.tag.Tag;
|
||||
import net.minecraft.tag.TagContainer;
|
||||
import net.minecraft.world.World;
|
||||
|
||||
import javax.annotation.Nonnull;
|
||||
|
@ -41,16 +41,16 @@ public class TagUtils {
|
|||
return tag.contains(type);
|
||||
}
|
||||
|
||||
public static TagCollection<Block> getAllBlockTags(World world) {
|
||||
return world.getTags().getBlocks();
|
||||
public static TagContainer<Block> getAllBlockTags(World world) {
|
||||
return world.getTagManager().blocks();
|
||||
}
|
||||
|
||||
public static TagCollection<Item> getAllItemTags(World world) {
|
||||
return world.getTags().getItems();
|
||||
public static TagContainer<Item> getAllItemTags(World world) {
|
||||
return world.getTagManager().items();
|
||||
}
|
||||
|
||||
public static TagCollection<Fluid> getAllFluidTags(World world) {
|
||||
return world.getTags().getFluids();
|
||||
public static TagContainer<Fluid> getAllFluidTags(World world) {
|
||||
return world.getTagManager().fluids();
|
||||
}
|
||||
|
||||
public static String toFirstLower(String string) {
|
||||
|
@ -105,7 +105,7 @@ public class TagUtils {
|
|||
|
||||
|
||||
@Deprecated
|
||||
public static boolean isOre(IBlockState state, String oreName) {
|
||||
public static boolean isOre(BlockState state, String oreName) {
|
||||
throw new UnsupportedOperationException("Move to tags");
|
||||
}
|
||||
|
||||
|
|
|
@ -24,7 +24,7 @@
|
|||
|
||||
package techreborn.utils.damageSources;
|
||||
|
||||
import net.minecraft.util.DamageSource;
|
||||
import net.minecraft.entity.damage.DamageSource;
|
||||
|
||||
/**
|
||||
* Created by modmuss50 on 06/03/2016.
|
||||
|
|
|
@ -24,7 +24,7 @@
|
|||
|
||||
package techreborn.utils.damageSources;
|
||||
|
||||
import net.minecraft.util.DamageSource;
|
||||
import net.minecraft.entity.damage.DamageSource;
|
||||
|
||||
/**
|
||||
* Created by modmuss50 on 05/03/2016.
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue