mirror of
https://github.com/MinecraftForge/MinecraftForge.git
synced 2026-11-19 03:49:14 +00:00
Fix the rest of the "easy" compile errors (#5151)
* Add Entity.changeDimension patch and transitively required patches * Fix throws declaration on CommandSetDimension#execute * Fix rest of errors in fluid package * Add PLAYER_REACH attribute * Fix compile errors in fml.client.config and add GuiButton patch * Delete unnecessary client.config classes, fix all config errors * Comment some fluid errors in models * Fix all errors in common package root, except ForgeHooks * Mass comment network package * Experimental conversion of extended states to generic base class * Fix errors in common.util * Remove config annotation stuff cuz lex said so * Make extended state stuff compile fully
This commit is contained in:
1 parent
6814cbf0df
commit
c4cf950863
72 files changed
+610
-5996
No files matched your search
@@ -67,7 +67,7 @@ public class DispenseFluidContainer extends BehaviorDefaultDispenseItem
|
||||
@Nonnull
|
||||
private ItemStack fillContainer(@Nonnull IBlockSource source, @Nonnull ItemStack stack)
|
||||
{
|
||||
World world = source.getWorld();
|
||||
World world = source.func_197524_h();
|
||||
EnumFacing dispenserFacing = source.getBlockState().getValue(BlockDispenser.FACING);
|
||||
BlockPos blockpos = source.getBlockPos().offset(dispenserFacing);
|
||||
|
||||
@@ -101,7 +101,7 @@ public class DispenseFluidContainer extends BehaviorDefaultDispenseItem
|
||||
{
|
||||
ItemStack singleStack = stack.copy();
|
||||
singleStack.setCount(1);
|
||||
IFluidHandlerItem fluidHandler = FluidUtil.getFluidHandler(singleStack);
|
||||
IFluidHandlerItem fluidHandler = null; // TODO fluids FluidUtil.getFluidHandler(singleStack);
|
||||
if (fluidHandler == null)
|
||||
{
|
||||
return super.dispenseStack(source, stack);
|
||||
@@ -110,7 +110,7 @@ public class DispenseFluidContainer extends BehaviorDefaultDispenseItem
|
||||
FluidStack fluidStack = fluidHandler.drain(Fluid.BUCKET_VOLUME, false);
|
||||
EnumFacing dispenserFacing = source.getBlockState().getValue(BlockDispenser.FACING);
|
||||
BlockPos blockpos = source.getBlockPos().offset(dispenserFacing);
|
||||
FluidActionResult result = fluidStack != null ? FluidUtil.tryPlaceFluid(null, source.getWorld(), blockpos, stack, fluidStack) : FluidActionResult.FAILURE;
|
||||
FluidActionResult result = fluidStack != null ? FluidUtil.tryPlaceFluid(null, source.func_197524_h(), blockpos, stack, fluidStack) : FluidActionResult.FAILURE;
|
||||
|
||||
if (result.isSuccess())
|
||||
{
|
||||
|
||||
@@ -29,10 +29,12 @@ import java.util.Locale;
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.block.material.Material;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.init.Particles;
|
||||
import net.minecraft.init.SoundEvents;
|
||||
import net.minecraft.util.SoundCategory;
|
||||
import net.minecraft.util.SoundEvent;
|
||||
import net.minecraft.util.math.BlockPos;
|
||||
import net.minecraft.util.text.translation.LanguageMap;
|
||||
import net.minecraft.util.ResourceLocation;
|
||||
import net.minecraft.world.World;
|
||||
import net.minecraft.item.EnumRarity;
|
||||
@@ -308,7 +310,7 @@ public class Fluid
|
||||
|
||||
for (int l = 0; l < 8; ++l)
|
||||
{
|
||||
worldIn.spawnParticle(EnumParticleTypes.SMOKE_LARGE, (double) pos.getX() + Math.random(), (double) pos.getY() + Math.random(), (double) pos.getZ() + Math.random(), 0.0D, 0.0D, 0.0D);
|
||||
worldIn.func_195589_b(Particles.field_197594_E, (double) pos.getX() + Math.random(), (double) pos.getY() + Math.random(), (double) pos.getZ() + Math.random(), 0.0D, 0.0D, 0.0D);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -318,7 +320,7 @@ public class Fluid
|
||||
public String getLocalizedName(FluidStack stack)
|
||||
{
|
||||
String s = this.getUnlocalizedName();
|
||||
return s == null ? "" : I18n.translateToLocal(s);
|
||||
return s == null ? "" : LanguageMap.getInstance().translateKey(s); // TODO Server translation
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@@ -26,6 +26,9 @@ import net.minecraftforge.registries.IRegistryDelegate;
|
||||
|
||||
import javax.annotation.Nullable;
|
||||
|
||||
import org.apache.logging.log4j.LogManager;
|
||||
import org.apache.logging.log4j.Logger;
|
||||
|
||||
/**
|
||||
* ItemStack substitute for Fluids.
|
||||
*
|
||||
@@ -36,6 +39,8 @@ import javax.annotation.Nullable;
|
||||
*/
|
||||
public class FluidStack
|
||||
{
|
||||
private static final Logger LOGGER = LogManager.getLogger();
|
||||
|
||||
public int amount;
|
||||
public NBTTagCompound tag;
|
||||
private IRegistryDelegate<Fluid> fluidDelegate;
|
||||
@@ -44,15 +49,15 @@ public class FluidStack
|
||||
{
|
||||
if (fluid == null)
|
||||
{
|
||||
FMLLog.bigWarning("Null fluid supplied to fluidstack. Did you try and create a stack for an unregistered fluid?");
|
||||
LOGGER.fatal("Null fluid supplied to fluidstack. Did you try and create a stack for an unregistered fluid?");
|
||||
throw new IllegalArgumentException("Cannot create a fluidstack from a null fluid");
|
||||
}
|
||||
}/* TODO fluids
|
||||
else if (!FluidRegistry.isFluidRegistered(fluid))
|
||||
{
|
||||
FMLLog.bigWarning("Failed attempt to create a FluidStack for an unregistered Fluid {} (type {})", fluid.getName(), fluid.getClass().getName());
|
||||
LOGGER.fatal("Failed attempt to create a FluidStack for an unregistered Fluid {} (type {})", fluid.getName(), fluid.getClass().getName());
|
||||
throw new IllegalArgumentException("Cannot create a fluidstack from an unregistered fluid");
|
||||
}
|
||||
this.fluidDelegate = FluidRegistry.makeDelegate(fluid);
|
||||
} */
|
||||
this.fluidDelegate = null; // TODO fluids FluidRegistry.makeDelegate(fluid);
|
||||
this.amount = amount;
|
||||
}
|
||||
|
||||
@@ -88,22 +93,22 @@ public class FluidStack
|
||||
}
|
||||
|
||||
String fluidName = nbt.getString("FluidName");
|
||||
if (FluidRegistry.getFluid(fluidName) == null)
|
||||
// TODO fluids if (FluidRegistry.getFluid(fluidName) == null)
|
||||
{
|
||||
return null;
|
||||
}
|
||||
}/*
|
||||
FluidStack stack = new FluidStack(FluidRegistry.getFluid(fluidName), nbt.getInteger("Amount"));
|
||||
|
||||
if (nbt.hasKey("Tag"))
|
||||
{
|
||||
stack.tag = nbt.getCompoundTag("Tag");
|
||||
}
|
||||
return stack;
|
||||
return stack;*/
|
||||
}
|
||||
|
||||
public NBTTagCompound writeToNBT(NBTTagCompound nbt)
|
||||
{
|
||||
nbt.setString("FluidName", FluidRegistry.getFluidName(getFluid()));
|
||||
// TODO fluids bt.setString("FluidName", FluidRegistry.getFluidName(getFluid()));
|
||||
nbt.setInteger("Amount", amount);
|
||||
|
||||
if (tag != null)
|
||||
@@ -199,7 +204,7 @@ public class FluidStack
|
||||
return false;
|
||||
}
|
||||
|
||||
return isFluidEqual(FluidUtil.getFluidContained(other));
|
||||
return FluidUtil.getFluidContained(other).map(this::isFluidEqual).orElse(false);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -704,7 +704,7 @@ public class FluidUtil
|
||||
*/
|
||||
@Nonnull
|
||||
public static ItemStack getFilledBucket(@Nonnull FluidStack fluidStack)
|
||||
{
|
||||
{/* TODO fluids
|
||||
Fluid fluid = fluidStack.getFluid();
|
||||
|
||||
if (fluidStack.tag == null || fluidStack.tag.isEmpty())
|
||||
@@ -735,7 +735,7 @@ public class FluidUtil
|
||||
|
||||
return filledBucket;
|
||||
}
|
||||
|
||||
*/
|
||||
return ItemStack.EMPTY;
|
||||
}
|
||||
}
|
||||
@@ -20,10 +20,10 @@
|
||||
package net.minecraftforge.fluids;
|
||||
|
||||
import net.minecraft.block.BlockDispenser;
|
||||
import net.minecraft.creativetab.CreativeTabs;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.init.Items;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.item.ItemGroup;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.nbt.NBTTagCompound;
|
||||
import net.minecraft.stats.StatList;
|
||||
@@ -33,7 +33,9 @@ import net.minecraft.util.EnumHand;
|
||||
import net.minecraft.util.NonNullList;
|
||||
import net.minecraft.util.math.BlockPos;
|
||||
import net.minecraft.util.math.RayTraceResult;
|
||||
import net.minecraft.util.text.translation.I18n;
|
||||
import net.minecraft.util.text.ITextComponent;
|
||||
import net.minecraft.util.text.TextComponentTranslation;
|
||||
import net.minecraft.util.text.translation.LanguageMap;
|
||||
import net.minecraft.world.World;
|
||||
import net.minecraftforge.common.capabilities.ICapabilityProvider;
|
||||
import net.minecraftforge.event.entity.player.FillBucketEvent;
|
||||
@@ -59,9 +61,9 @@ public class UniversalBucket extends Item
|
||||
private final ItemStack empty; // empty item to return and recognize when filling
|
||||
private final boolean nbtSensitive;
|
||||
|
||||
public UniversalBucket()
|
||||
public UniversalBucket(Builder builder)
|
||||
{
|
||||
this(Fluid.BUCKET_VOLUME, new ItemStack(Items.BUCKET), false);
|
||||
this(builder, Fluid.BUCKET_VOLUME, new ItemStack(Items.BUCKET), false);
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -69,17 +71,19 @@ public class UniversalBucket extends Item
|
||||
* @param empty Item used for filling with the bucket event and returned when emptied
|
||||
* @param nbtSensitive Whether the empty item is NBT sensitive (usually true if empty and full are the same items)
|
||||
*/
|
||||
public UniversalBucket(int capacity, @Nonnull ItemStack empty, boolean nbtSensitive)
|
||||
public UniversalBucket(Builder builder, int capacity, @Nonnull ItemStack empty, boolean nbtSensitive)
|
||||
{
|
||||
super(builder);
|
||||
this.capacity = capacity;
|
||||
this.empty = empty;
|
||||
this.nbtSensitive = nbtSensitive;
|
||||
|
||||
|
||||
/* TODO move to builder construction
|
||||
this.setMaxStackSize(1);
|
||||
|
||||
this.setCreativeTab(CreativeTabs.MISC);
|
||||
|
||||
BlockDispenser.DISPENSE_BEHAVIOR_REGISTRY.putObject(this, DispenseFluidContainer.getInstance());
|
||||
*/
|
||||
BlockDispenser.func_199774_a(this, DispenseFluidContainer.getInstance());
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -101,10 +105,10 @@ public class UniversalBucket extends Item
|
||||
}
|
||||
|
||||
@Override
|
||||
public void getSubItems(@Nullable CreativeTabs tab, @Nonnull NonNullList<ItemStack> subItems)
|
||||
public void getSubItems(@Nullable ItemGroup tab, @Nonnull NonNullList<ItemStack> subItems)
|
||||
{
|
||||
if (!this.isInCreativeTab(tab))
|
||||
return;
|
||||
return;/* TODO fluids
|
||||
for (Fluid fluid : FluidRegistry.getRegisteredFluids().values())
|
||||
{
|
||||
if (fluid != FluidRegistry.WATER && fluid != FluidRegistry.LAVA && !fluid.getName().equals("milk"))
|
||||
@@ -119,31 +123,32 @@ public class UniversalBucket extends Item
|
||||
subItems.add(filled);
|
||||
}
|
||||
}
|
||||
}
|
||||
}*/
|
||||
}
|
||||
|
||||
@Override
|
||||
@Nonnull
|
||||
public String getItemStackDisplayName(@Nonnull ItemStack stack)
|
||||
public ITextComponent func_200295_i(@Nonnull ItemStack stack)
|
||||
{
|
||||
FluidStack fluidStack = getFluid(stack);
|
||||
if (fluidStack == null)
|
||||
{
|
||||
if(!getEmpty().isEmpty())
|
||||
{
|
||||
return getEmpty().getDisplayName();
|
||||
return getEmpty().func_200301_q();
|
||||
}
|
||||
return super.getItemStackDisplayName(stack);
|
||||
return super.func_200295_i(stack);
|
||||
}
|
||||
|
||||
String unloc = this.getUnlocalizedNameInefficiently(stack);
|
||||
String unloc = this.getTranslationKey();
|
||||
|
||||
if (I18n.canTranslate(unloc + "." + fluidStack.getFluid().getName()))
|
||||
// TODO this is not reliable on the server
|
||||
if (LanguageMap.getInstance().func_210813_b(unloc + "." + fluidStack.getFluid().getName()))
|
||||
{
|
||||
return I18n.translateToLocal(unloc + "." + fluidStack.getFluid().getName());
|
||||
return new TextComponentTranslation(unloc + "." + fluidStack.getFluid().getName());
|
||||
}
|
||||
|
||||
return I18n.translateToLocalFormatted(unloc + ".name", fluidStack.getLocalizedName());
|
||||
return new TextComponentTranslation(unloc + ".name", fluidStack.getLocalizedName());
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -291,7 +296,7 @@ public class UniversalBucket extends Item
|
||||
public String getCreatorModId(@Nonnull ItemStack itemStack)
|
||||
{
|
||||
FluidStack fluidStack = getFluid(itemStack);
|
||||
String modId = FluidRegistry.getModId(fluidStack);
|
||||
String modId = null; // TODO fluids FluidRegistry.getModId(fluidStack);
|
||||
return modId != null ? modId : super.getCreatorModId(itemStack);
|
||||
}
|
||||
|
||||
|
||||
@@ -64,18 +64,19 @@ public class FluidBucketWrapper implements IFluidHandlerItem, ICapabilityProvide
|
||||
}
|
||||
|
||||
public boolean canFillFluidType(FluidStack fluid)
|
||||
{
|
||||
{/* TODO fluids
|
||||
if (fluid.getFluid() == FluidRegistry.WATER || fluid.getFluid() == FluidRegistry.LAVA || fluid.getFluid().getName().equals("milk"))
|
||||
{
|
||||
return true;
|
||||
}
|
||||
return FluidRegistry.isUniversalBucketEnabled() && FluidRegistry.getBucketFluids().contains(fluid.getFluid());
|
||||
*/ return false;
|
||||
}
|
||||
|
||||
@Nullable
|
||||
public FluidStack getFluid()
|
||||
{
|
||||
Item item = container.getItem();
|
||||
Item item = container.getItem();/* TODO fluids
|
||||
if (item == Items.WATER_BUCKET)
|
||||
{
|
||||
return new FluidStack(FluidRegistry.WATER, Fluid.BUCKET_VOLUME);
|
||||
@@ -88,7 +89,7 @@ public class FluidBucketWrapper implements IFluidHandlerItem, ICapabilityProvide
|
||||
{
|
||||
return FluidRegistry.getFluidStack("milk", Fluid.BUCKET_VOLUME);
|
||||
}
|
||||
else if (item == ForgeMod.getInstance().universalBucket)
|
||||
else*/ if (item == ForgeMod.getInstance().universalBucket)
|
||||
{
|
||||
return ForgeMod.getInstance().universalBucket.getFluid(container);
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user