mirror of
https://github.com/MinecraftForge/MinecraftForge.git
synced 2026-11-20 12:20:11 +00:00
1.16.3 Update
Also included a bunch of warning cleanups.
This commit is contained in:
1 parent
2353cd982a
commit
c75eb9e7cf
73 files changed
+73
-381
No files matched your search
@@ -23,7 +23,6 @@ import net.minecraft.entity.ai.attributes.Attribute;
|
||||
import net.minecraft.entity.ai.attributes.RangedAttribute;
|
||||
import net.minecraft.util.SoundEvent;
|
||||
import net.minecraft.world.storage.IServerConfiguration;
|
||||
import net.minecraft.world.storage.IWorldInfo;
|
||||
import net.minecraft.world.storage.SaveFormat;
|
||||
import net.minecraftforge.eventbus.api.IEventBus;
|
||||
import net.minecraftforge.eventbus.api.SubscribeEvent;
|
||||
@@ -31,14 +30,10 @@ import net.minecraftforge.fml.*;
|
||||
import net.minecraftforge.fml.config.ModConfig;
|
||||
import net.minecraftforge.fml.event.lifecycle.FMLCommonSetupEvent;
|
||||
import net.minecraftforge.fml.event.lifecycle.FMLModIdMappingEvent;
|
||||
import net.minecraftforge.fml.event.server.FMLServerStartingEvent;
|
||||
import net.minecraftforge.fml.event.server.FMLServerStoppingEvent;
|
||||
import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext;
|
||||
import net.minecraftforge.fml.loading.progress.StartupMessageManager;
|
||||
import net.minecraftforge.registries.DeferredRegister;
|
||||
import net.minecraftforge.registries.ForgeRegistries;
|
||||
import net.minecraftforge.server.command.ConfigCommand;
|
||||
import net.minecraftforge.server.command.ForgeCommand;
|
||||
import net.minecraftforge.versions.forge.ForgeVersion;
|
||||
import net.minecraftforge.versions.mcp.MCPVersion;
|
||||
|
||||
|
||||
@@ -19,14 +19,11 @@
|
||||
|
||||
package net.minecraftforge.common;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.Arrays;
|
||||
import java.util.HashMap;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
import com.google.common.collect.Lists;
|
||||
|
||||
import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
|
||||
import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
|
||||
import net.minecraft.entity.merchant.villager.VillagerProfession;
|
||||
|
||||
@@ -32,7 +32,6 @@ import com.google.gson.TypeAdapter;
|
||||
import com.google.gson.TypeAdapterFactory;
|
||||
import com.google.gson.reflect.TypeToken;
|
||||
import com.google.gson.stream.JsonReader;
|
||||
import com.google.gson.stream.JsonToken;
|
||||
import com.google.gson.stream.JsonWriter;
|
||||
|
||||
import javax.annotation.Nullable;
|
||||
|
||||
@@ -24,8 +24,6 @@ import net.minecraft.item.Item;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.potion.PotionBrewing;
|
||||
|
||||
import javax.annotation.Nonnull;
|
||||
|
||||
/**
|
||||
* Used in BrewingRecipeRegistry to maintain the vanilla behaviour.
|
||||
*
|
||||
|
||||
@@ -46,7 +46,6 @@ import net.minecraft.item.crafting.Ingredient.IItemList;
|
||||
import net.minecraft.item.crafting.Ingredient.TagList;
|
||||
import net.minecraft.item.crafting.Ingredient.SingleItemList;
|
||||
import net.minecraft.tags.ITag;
|
||||
import net.minecraft.tags.Tag;
|
||||
import net.minecraft.util.IItemProvider;
|
||||
import net.minecraft.util.ResourceLocation;
|
||||
import net.minecraftforge.common.Tags;
|
||||
@@ -90,7 +89,7 @@ public class ForgeRecipeProvider extends RecipeProvider
|
||||
exclude(Blocks.DIAMOND_BLOCK);
|
||||
exclude(Blocks.EMERALD_BLOCK);
|
||||
exclude(Blocks.field_235397_ng_);
|
||||
|
||||
|
||||
exclude(Blocks.COBBLESTONE_STAIRS);
|
||||
exclude(Blocks.COBBLESTONE_SLAB);
|
||||
exclude(Blocks.COBBLESTONE_WALL);
|
||||
|
||||
@@ -19,11 +19,8 @@
|
||||
|
||||
package net.minecraftforge.common.extensions;
|
||||
|
||||
import java.util.Collection;
|
||||
import java.util.Optional;
|
||||
import java.util.Set;
|
||||
import java.util.function.Predicate;
|
||||
|
||||
import javax.annotation.Nullable;
|
||||
|
||||
import net.minecraft.block.*;
|
||||
@@ -43,17 +40,13 @@ import net.minecraft.entity.projectile.WitherSkullEntity;
|
||||
import net.minecraft.fluid.FluidState;
|
||||
import net.minecraft.potion.Effects;
|
||||
import net.minecraft.item.AxeItem;
|
||||
import net.minecraft.item.DyeColor;
|
||||
import net.minecraft.item.HoeItem;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.item.ShovelItem;
|
||||
import net.minecraft.pathfinding.PathNodeType;
|
||||
import net.minecraft.state.Property;
|
||||
import net.minecraft.state.properties.BedPart;
|
||||
import net.minecraft.tags.BlockTags;
|
||||
import net.minecraft.tileentity.TileEntity;
|
||||
import net.minecraft.util.Direction;
|
||||
import net.minecraft.util.Hand;
|
||||
import net.minecraft.util.ResourceLocation;
|
||||
import net.minecraft.util.Rotation;
|
||||
import net.minecraft.util.math.BlockPos;
|
||||
@@ -911,7 +904,7 @@ public interface IForgeBlock
|
||||
else if(toolType == ToolType.HOE) return HoeItem.getHoeTillingState(state);
|
||||
else return toolType == ToolType.SHOVEL ? ShovelItem.getShovelPathingState(state) : null;
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Checks if a player or entity handles movement on this block like scaffolding.
|
||||
*
|
||||
|
||||
@@ -24,7 +24,6 @@ import java.util.Set;
|
||||
import javax.annotation.Nullable;
|
||||
|
||||
import net.minecraft.block.material.Material;
|
||||
import net.minecraft.client.renderer.model.IBakedModel;
|
||||
import net.minecraft.entity.Entity;
|
||||
import net.minecraft.fluid.Fluid;
|
||||
import net.minecraft.fluid.FluidState;
|
||||
@@ -98,6 +97,7 @@ public interface IForgeFluid
|
||||
* @param explosion The explosion
|
||||
* @return The amount of the explosion absorbed.
|
||||
*/
|
||||
@SuppressWarnings("deprecation")
|
||||
default float getExplosionResistance(FluidState state, IBlockReader world, BlockPos pos, Explosion explosion)
|
||||
{
|
||||
return state.getExplosionResistance();
|
||||
|
||||
@@ -24,7 +24,6 @@ import java.util.function.Consumer;
|
||||
|
||||
import javax.annotation.Nullable;
|
||||
|
||||
import com.google.common.collect.ImmutableMap;
|
||||
import com.google.common.collect.Multimap;
|
||||
|
||||
import net.minecraft.block.BlockState;
|
||||
@@ -54,14 +53,11 @@ import net.minecraft.util.ActionResultType;
|
||||
import net.minecraft.util.ResourceLocation;
|
||||
import net.minecraft.util.math.BlockPos;
|
||||
import net.minecraft.util.math.MathHelper;
|
||||
import net.minecraft.util.text.IFormattableTextComponent;
|
||||
import net.minecraft.util.text.ITextComponent;
|
||||
import net.minecraft.world.World;
|
||||
import net.minecraftforge.api.distmarker.Dist;
|
||||
import net.minecraftforge.api.distmarker.OnlyIn;
|
||||
import net.minecraftforge.common.Tags;
|
||||
import net.minecraftforge.common.ToolType;
|
||||
import net.minecraftforge.common.animation.ITimeValue;
|
||||
|
||||
// TODO review most of the methods in this "patch"
|
||||
public interface IForgeItem
|
||||
@@ -241,6 +237,7 @@ public interface IForgeItem
|
||||
* @param itemStack The current ItemStack
|
||||
* @return The resulting ItemStack
|
||||
*/
|
||||
@SuppressWarnings("deprecation")
|
||||
default ItemStack getContainerItem(ItemStack itemStack)
|
||||
{
|
||||
if (!hasContainerItem(itemStack))
|
||||
|
||||
@@ -21,7 +21,6 @@ package net.minecraftforge.common.model;
|
||||
|
||||
import com.google.common.collect.ImmutableList;
|
||||
import com.google.common.collect.ImmutableSet;
|
||||
import com.google.common.collect.Iterators;
|
||||
import com.google.common.collect.UnmodifiableIterator;
|
||||
|
||||
public enum Models
|
||||
|
||||
Reference in new issue
Block a user