Update to 1.17

Update to Official classnames
Patchwork
Make the game compile and run
Merge in the new HUD overlay API
Merge in the new render properties API
PEEL
Use Gradle 7.2 snapshot to fix eclipse integration bug in 7.1, Would use 7.0 but FG needs 7.1 for some reason.
New FML installer
Update to 1.17.1

Co-authored-by: LexManos <[email protected]>
Co-authored-by: SizableShrimp <[email protected]>
Co-authored-by: cpw <[email protected]>
Co-authored-by: Curle <[email protected]>
Co-authored-by: Unnoen <[email protected]>
Co-authored-by: covers1624 <[email protected]>
Co-authored-by: DaemonUmbra <[email protected]>
Co-authored-by: gigaherz <[email protected]>
Signed-off-by: SizableShrimp <[email protected]>
This commit is contained in:
authored and Curle committed 2021-07-22 19:57:02 +01:00
1 parent 064ae6961b
commit be5446b91c
1990 files changed
+35661 -37544

No files matched your search

@@ -23,35 +23,35 @@ import java.util.Random;
import javax.annotation.Nonnull;
import net.minecraft.client.renderer.texture.AtlasTexture;
import net.minecraft.client.renderer.texture.NativeImage;
import com.mojang.blaze3d.platform.NativeImage;
import net.minecraft.client.renderer.texture.TextureAtlas;
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
import net.minecraft.item.Item;
import net.minecraft.resources.IResource;
import net.minecraft.resources.IResourceManager;
import net.minecraft.util.ResourceLocation;
import net.minecraft.client.renderer.texture.Tickable;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.server.packs.resources.Resource;
import net.minecraft.server.packs.resources.ResourceManager;
import net.minecraft.world.item.Item;
import net.minecraftforge.client.MinecraftForgeClient;
import net.minecraftforge.client.textures.ITextureAtlasSpriteLoader;
import net.minecraftforge.fml.RegistryObject;
import net.minecraftforge.fml.common.Mod;
import net.minecraftforge.fml.event.lifecycle.FMLClientSetupEvent;
import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext;
import net.minecraftforge.fml.loading.FMLLoader;
import net.minecraftforge.fmllegacy.RegistryObject;
import net.minecraftforge.registries.DeferredRegister;
import net.minecraftforge.registries.ForgeRegistries;
@Mod(CustomTASTest.MOD_ID)
public class CustomTASTest
{
private static final boolean enabled = true;
private static final boolean ENABLED = true;
static final String MOD_ID = "custom_tas_test";
private static final DeferredRegister<Item> ITEMS = DeferredRegister.create(ForgeRegistries.ITEMS, MOD_ID);
private static final RegistryObject<Item> TEST_ITEM = ITEMS.register("test_item", () -> new Item(new Item.Properties()));
public CustomTASTest()
{
if (enabled)
if (ENABLED)
{
if (FMLLoader.getDist().isClient())
{
@@ -70,23 +70,21 @@ public class CustomTASTest
{
@Override
@Nonnull
public TextureAtlasSprite load(AtlasTexture atlas, IResourceManager resourceManager, TextureAtlasSprite.Info textureInfo, IResource resource, int atlasWidth, int atlasHeight, int spriteX, int spriteY, int mipmapLevel, NativeImage image)
public TextureAtlasSprite load(TextureAtlas atlas, ResourceManager resourceManager, TextureAtlasSprite.Info textureInfo, Resource resource, int atlasWidth, int atlasHeight, int spriteX, int spriteY, int mipmapLevel, NativeImage image)
{
return new TextureAtlasSprite(
atlas, textureInfo, mipmapLevel, atlasWidth, atlasHeight, spriteX, spriteY, image
)
{
private final Random random = new Random();
@Override
public boolean isAnimation()
public Tickable getAnimationTicker()
{
return true;
return this::tick;
}
@Override
public void cycleFrames()
private void tick()
{
this.mainImage[0].fillRect(0, 0, 16, 16, 0xFF000000 | random.nextInt(0xFFFFFF));
this.uploadFirstFrame();
@@ -0,0 +1,104 @@
/*
* Minecraft Forge
* Copyright (c) 2016-2021.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation version 2.1
* of the License.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
package net.minecraftforge.debug.client;
import net.minecraft.client.Minecraft;
import net.minecraftforge.api.distmarker.Dist;
import net.minecraftforge.client.event.InputEvent;
import net.minecraftforge.client.event.RenderGameOverlayEvent;
import net.minecraftforge.client.gui.OverlayRegistry;
import net.minecraftforge.common.MinecraftForge;
import net.minecraftforge.fml.common.Mod;
import net.minecraftforge.fml.loading.FMLEnvironment;
import org.lwjgl.glfw.GLFW;
import java.util.List;
@Mod("overlay_layers_test")
public class OverlayLayersTest
{
public static final boolean ENABLE = true;
private boolean visible = false;
public OverlayLayersTest()
{
if (ENABLE && FMLEnvironment.dist == Dist.CLIENT)
{
MinecraftForge.EVENT_BUS.addListener(this::renderTextEvent);
MinecraftForge.EVENT_BUS.addListener(this::keyInputEvent);
}
}
int overlayIndex = 0;
public void renderTextEvent(RenderGameOverlayEvent.Text event)
{
if (event.getType() != RenderGameOverlayEvent.ElementType.TEXT || !visible)
return;
List<OverlayRegistry.OverlayEntry> overlays = OverlayRegistry.orderedEntries();
for(int i=0;i<overlays.size();i++)
{
OverlayRegistry.OverlayEntry entry = overlays.get(i);
event.getLeft().add(String.format(overlayIndex == i ? "> %s [%s] <" : " %s [%s] ", entry.getDisplayName(), entry.isEnabled()));
}
}
public void keyInputEvent(InputEvent.KeyInputEvent event)
{
if (event.getAction() != GLFW.GLFW_PRESS || Minecraft.getInstance().level == null || Minecraft.getInstance().screen != null)
return;
if (event.getKey() == GLFW.GLFW_KEY_H)
{
visible = !visible;
return;
}
if (!visible)
return;
if (event.getKey() == GLFW.GLFW_KEY_J)
{
List<OverlayRegistry.OverlayEntry> overlays = OverlayRegistry.orderedEntries();
if (overlayIndex >= overlays.size())
overlayIndex = 0;
else
overlayIndex = (overlayIndex + overlays.size() - 1) % overlays.size();
}
else if (event.getKey() == GLFW.GLFW_KEY_K)
{
List<OverlayRegistry.OverlayEntry> overlays = OverlayRegistry.orderedEntries();
if (overlayIndex >= overlays.size())
overlayIndex = 0;
else
overlayIndex = (overlayIndex + 1) % overlays.size();
}
else if (event.getKey() == GLFW.GLFW_KEY_I)
{
List<OverlayRegistry.OverlayEntry> overlays = OverlayRegistry.orderedEntries();
if (overlayIndex >= overlays.size())
overlayIndex = 0;
else
{
OverlayRegistry.OverlayEntry entry = overlays.get(overlayIndex);
OverlayRegistry.enableOverlay(entry.getOverlay(), !entry.isEnabled());
}
}
}
}
@@ -19,25 +19,25 @@
package net.minecraftforge.debug.client.model;
import net.minecraft.block.Block;
import net.minecraft.block.BlockState;
import net.minecraft.block.material.Material;
import net.minecraft.entity.Entity;
import net.minecraft.inventory.EquipmentSlotType;
import net.minecraft.item.BlockItem;
import net.minecraft.item.BlockItemUseContext;
import net.minecraft.item.Item;
import net.minecraft.item.ItemGroup;
import net.minecraft.item.ItemStack;
import net.minecraft.state.StateContainer;
import net.minecraft.state.properties.BlockStateProperties;
import net.minecraft.util.math.BlockPos;
import net.minecraft.util.math.shapes.ISelectionContext;
import net.minecraft.util.math.shapes.VoxelShape;
import net.minecraft.util.math.shapes.VoxelShapes;
import net.minecraft.world.IBlockReader;
import net.minecraft.world.level.block.Block;
import net.minecraft.world.level.block.state.BlockState;
import net.minecraft.world.level.material.Material;
import net.minecraft.world.entity.Entity;
import net.minecraft.world.entity.EquipmentSlot;
import net.minecraft.world.item.BlockItem;
import net.minecraft.world.item.context.BlockPlaceContext;
import net.minecraft.world.item.Item;
import net.minecraft.world.item.CreativeModeTab;
import net.minecraft.world.item.ItemStack;
import net.minecraft.world.level.block.state.StateDefinition;
import net.minecraft.world.level.block.state.properties.BlockStateProperties;
import net.minecraft.core.BlockPos;
import net.minecraft.world.phys.shapes.CollisionContext;
import net.minecraft.world.phys.shapes.VoxelShape;
import net.minecraft.world.phys.shapes.Shapes;
import net.minecraft.world.level.BlockGetter;
import net.minecraftforge.eventbus.api.IEventBus;
import net.minecraftforge.fml.RegistryObject;
import net.minecraftforge.fmllegacy.RegistryObject;
import net.minecraftforge.fml.common.Mod;
import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext;
import net.minecraftforge.registries.DeferredRegister;
@@ -55,14 +55,14 @@ public class CompositeModelTest
public static RegistryObject<Block> composite_block = BLOCKS.register("composite_block", () ->
new Block(Block.Properties.of(Material.WOOD).strength(10)) {
@Override
protected void createBlockStateDefinition(StateContainer.Builder<Block, BlockState> builder)
protected void createBlockStateDefinition(StateDefinition.Builder<Block, BlockState> builder)
{
builder.add(BlockStateProperties.HORIZONTAL_FACING);
}
@Nullable
@Override
public BlockState getStateForPlacement(BlockItemUseContext context)
public BlockState getStateForPlacement(BlockPlaceContext context)
{
return defaultBlockState().setValue(
BlockStateProperties.HORIZONTAL_FACING, context.getHorizontalDirection()
@@ -70,8 +70,8 @@ public class CompositeModelTest
}
@Override
public VoxelShape getShape(BlockState state, IBlockReader worldIn, BlockPos pos, ISelectionContext context) {
return VoxelShapes.or(
public VoxelShape getShape(BlockState state, BlockGetter worldIn, BlockPos pos, CollisionContext context) {
return Shapes.or(
box(5.6, 5.6, 5.6, 10.4, 10.4, 10.4),
box(0, 0, 0, 4.8, 4.8, 4.8),
box(11.2, 0, 0, 16, 4.8, 4.8),
@@ -87,11 +87,11 @@ public class CompositeModelTest
);
public static RegistryObject<Item> composite_item = ITEMS.register("composite_block", () ->
new BlockItem(composite_block.get(), new Item.Properties().tab(ItemGroup.TAB_MISC)) {
new BlockItem(composite_block.get(), new Item.Properties().tab(CreativeModeTab.TAB_MISC)) {
@Override
public boolean canEquip(ItemStack stack, EquipmentSlotType armorType, Entity entity)
public boolean canEquip(ItemStack stack, EquipmentSlot armorType, Entity entity)
{
return armorType == EquipmentSlotType.HEAD;
return armorType == EquipmentSlot.HEAD;
}
}
);
@@ -19,10 +19,10 @@
package net.minecraftforge.debug.client.model;
import net.minecraft.item.Item;
import net.minecraft.item.ItemGroup;
import net.minecraft.world.item.Item;
import net.minecraft.world.item.CreativeModeTab;
import net.minecraftforge.eventbus.api.IEventBus;
import net.minecraftforge.fml.RegistryObject;
import net.minecraftforge.fmllegacy.RegistryObject;
import net.minecraftforge.fml.common.Mod;
import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext;
import net.minecraftforge.registries.DeferredRegister;
@@ -31,15 +31,19 @@ import net.minecraftforge.registries.ForgeRegistries;
@Mod(DynBucketModelTest.MODID)
public class DynBucketModelTest
{
public static final boolean ENABLE = false; // TODO fix
public static final String MODID = "dyn_bucket_model_test";
public static final DeferredRegister<Item> ITEMS = DeferredRegister.create(ForgeRegistries.ITEMS, MODID);
public static final RegistryObject<Item> DRIP_BUCKET = ITEMS.register("drip_bucket", () -> new Item(new Item.Properties().tab(ItemGroup.TAB_MISC)));
public static final RegistryObject<Item> LAVA_OBSIDIAN = ITEMS.register("lava_obsidian", () -> new Item(new Item.Properties().tab(ItemGroup.TAB_MISC)));
public static final RegistryObject<Item> DRIP_BUCKET = ITEMS.register("drip_bucket", () -> new Item(new Item.Properties().tab(CreativeModeTab.TAB_MISC)));
public static final RegistryObject<Item> LAVA_OBSIDIAN = ITEMS.register("lava_obsidian", () -> new Item(new Item.Properties().tab(CreativeModeTab.TAB_MISC)));
public DynBucketModelTest()
{
IEventBus modEventBus = FMLJavaModLoadingContext.get().getModEventBus();
ITEMS.register(modEventBus);
if (ENABLE)
{
IEventBus modEventBus = FMLJavaModLoadingContext.get().getModEventBus();
ITEMS.register(modEventBus);
}
}
}
@@ -19,14 +19,14 @@
package net.minecraftforge.debug.client.model;
import net.minecraft.block.Block;
import net.minecraft.block.material.Material;
import net.minecraft.world.level.block.Block;
import net.minecraft.world.level.material.Material;
import net.minecraft.client.renderer.RenderType;
import net.minecraft.client.renderer.RenderTypeLookup;
import net.minecraft.item.BlockItem;
import net.minecraft.item.Item;
import net.minecraft.item.ItemGroup;
import net.minecraft.util.ResourceLocation;
import net.minecraft.client.renderer.ItemBlockRenderTypes;
import net.minecraft.world.item.BlockItem;
import net.minecraft.world.item.Item;
import net.minecraft.world.item.CreativeModeTab;
import net.minecraft.resources.ResourceLocation;
import net.minecraftforge.event.RegistryEvent;
import net.minecraftforge.fml.common.Mod;
import net.minecraftforge.fml.event.lifecycle.FMLClientSetupEvent;
@@ -64,7 +64,7 @@ public class MultiLayerModelTest
{
if (!ENABLED)
return;
event.getRegistry().register(new BlockItem(TEST_BLOCK, new Item.Properties().tab(ItemGroup.TAB_MISC)).setRegistryName(TEST_BLOCK.getRegistryName()));
event.getRegistry().register(new BlockItem(TEST_BLOCK, new Item.Properties().tab(CreativeModeTab.TAB_MISC)).setRegistryName(TEST_BLOCK.getRegistryName()));
}
@net.minecraftforge.eventbus.api.SubscribeEvent
@@ -72,7 +72,7 @@ public class MultiLayerModelTest
{
if (!ENABLED)
return;
RenderTypeLookup.setRenderLayer(TEST_BLOCK, (layer) -> {
ItemBlockRenderTypes.setRenderLayer(TEST_BLOCK, (layer) -> {
return layer == RenderType.solid() || layer == RenderType.translucent();
});
}
@@ -23,32 +23,32 @@ import com.google.common.collect.ImmutableList;
import com.google.gson.JsonDeserializationContext;
import com.google.gson.JsonObject;
import com.mojang.datafixers.util.Pair;
import net.minecraft.block.Block;
import net.minecraft.block.BlockState;
import net.minecraft.block.material.Material;
import net.minecraft.client.renderer.model.*;
import net.minecraft.world.level.block.Block;
import net.minecraft.world.level.block.state.BlockState;
import net.minecraft.world.level.material.Material;
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
import net.minecraft.client.renderer.vertex.DefaultVertexFormats;
import net.minecraft.client.renderer.vertex.VertexFormatElement;
import com.mojang.blaze3d.vertex.DefaultVertexFormat;
import com.mojang.blaze3d.vertex.VertexFormatElement;
import net.minecraft.data.DataGenerator;
import net.minecraft.entity.Entity;
import net.minecraft.inventory.EquipmentSlotType;
import net.minecraft.item.*;
import net.minecraft.resources.IResourceManager;
import net.minecraft.state.StateContainer;
import net.minecraft.state.properties.BlockStateProperties;
import net.minecraft.util.Direction;
import net.minecraft.util.ResourceLocation;
import net.minecraft.util.math.BlockPos;
import net.minecraft.util.math.shapes.ISelectionContext;
import net.minecraft.util.math.shapes.VoxelShape;
import net.minecraft.world.IBlockReader;
import net.minecraft.world.entity.Entity;
import net.minecraft.world.entity.EquipmentSlot;
import net.minecraft.server.packs.resources.ResourceManager;
import net.minecraft.world.level.block.state.StateDefinition;
import net.minecraft.world.level.block.state.properties.BlockStateProperties;
import net.minecraft.core.Direction;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.core.BlockPos;
import net.minecraft.world.phys.shapes.CollisionContext;
import net.minecraft.world.phys.shapes.VoxelShape;
import net.minecraft.world.level.BlockGetter;
import net.minecraftforge.client.event.ModelRegistryEvent;
import net.minecraftforge.client.model.IModelBuilder;
import net.minecraftforge.client.model.IModelConfiguration;
import net.minecraftforge.client.model.IModelLoader;
import net.minecraftforge.client.model.ModelLoaderRegistry;
import net.minecraftforge.client.model.generators.BlockModelBuilder;
import net.minecraftforge.client.model.generators.BlockStateProvider;
import net.minecraftforge.client.model.generators.ConfiguredModel;
import net.minecraftforge.client.model.generators.ItemModelProvider;
import net.minecraftforge.client.model.generators.loaders.ItemLayersModelBuilder;
import net.minecraftforge.client.model.generators.loaders.OBJLoaderBuilder;
@@ -57,9 +57,9 @@ import net.minecraftforge.client.model.geometry.ISimpleModelGeometry;
import net.minecraftforge.client.model.pipeline.BakedQuadBuilder;
import net.minecraftforge.common.data.ExistingFileHelper;
import net.minecraftforge.eventbus.api.IEventBus;
import net.minecraftforge.fml.RegistryObject;
import net.minecraftforge.fmllegacy.RegistryObject;
import net.minecraftforge.fml.common.Mod;
import net.minecraftforge.fml.event.lifecycle.GatherDataEvent;
import net.minecraftforge.forge.event.lifecycle.GatherDataEvent;
import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext;
import net.minecraftforge.registries.DeferredRegister;
import net.minecraftforge.registries.ForgeRegistries;
@@ -70,6 +70,16 @@ import java.util.Collections;
import java.util.Set;
import java.util.function.Function;
import net.minecraft.client.renderer.block.model.ItemTransforms;
import net.minecraft.client.resources.model.ModelBakery;
import net.minecraft.client.resources.model.ModelState;
import net.minecraft.client.resources.model.UnbakedModel;
import net.minecraft.world.item.BlockItem;
import net.minecraft.world.item.CreativeModeTab;
import net.minecraft.world.item.Item;
import net.minecraft.world.item.ItemStack;
import net.minecraft.world.item.context.BlockPlaceContext;
@Mod(NewModelLoaderTest.MODID)
public class NewModelLoaderTest
{
@@ -80,14 +90,14 @@ public class NewModelLoaderTest
public static RegistryObject<Block> obj_block = BLOCKS.register("obj_block", () ->
new Block(Block.Properties.of(Material.WOOD).strength(10)) {
@Override
protected void createBlockStateDefinition(StateContainer.Builder<Block, BlockState> builder)
protected void createBlockStateDefinition(StateDefinition.Builder<Block, BlockState> builder)
{
builder.add(BlockStateProperties.HORIZONTAL_FACING);
}
@Nullable
@Override
public BlockState getStateForPlacement(BlockItemUseContext context)
public BlockState getStateForPlacement(BlockPlaceContext context)
{
return defaultBlockState().setValue(
BlockStateProperties.HORIZONTAL_FACING, context.getHorizontalDirection()
@@ -95,7 +105,7 @@ public class NewModelLoaderTest
}
@Override
public VoxelShape getShape(BlockState state, IBlockReader worldIn, BlockPos pos, ISelectionContext context)
public VoxelShape getShape(BlockState state, BlockGetter worldIn, BlockPos pos, CollisionContext context)
{
return Block.box(2,2,2,14,14,14);
}
@@ -103,33 +113,33 @@ public class NewModelLoaderTest
);
public static RegistryObject<Item> obj_item = ITEMS.register("obj_block", () ->
new BlockItem(obj_block.get(), new Item.Properties().tab(ItemGroup.TAB_MISC)) {
new BlockItem(obj_block.get(), new Item.Properties().tab(CreativeModeTab.TAB_MISC)) {
@Override
public boolean canEquip(ItemStack stack, EquipmentSlotType armorType, Entity entity)
public boolean canEquip(ItemStack stack, EquipmentSlot armorType, Entity entity)
{
return armorType == EquipmentSlotType.HEAD;
return armorType == EquipmentSlot.HEAD;
}
}
);
public static RegistryObject<Item> custom_transforms = ITEMS.register("custom_transforms", () ->
new Item(new Item.Properties().tab(ItemGroup.TAB_MISC))
new Item(new Item.Properties().tab(CreativeModeTab.TAB_MISC))
);
public static RegistryObject<Item> custom_vanilla_loader = ITEMS.register("custom_vanilla_loader", () ->
new Item(new Item.Properties().tab(ItemGroup.TAB_MISC))
new Item(new Item.Properties().tab(CreativeModeTab.TAB_MISC))
);
public static RegistryObject<Item> custom_loader = ITEMS.register("custom_loader", () ->
new Item(new Item.Properties().tab(ItemGroup.TAB_MISC))
new Item(new Item.Properties().tab(CreativeModeTab.TAB_MISC))
);
public static RegistryObject<Item> item_layers = ITEMS.register("item_layers", () ->
new Item(new Item.Properties().tab(ItemGroup.TAB_MISC))
new Item(new Item.Properties().tab(CreativeModeTab.TAB_MISC))
);
public static RegistryObject<Item> separate_perspective = ITEMS.register("separate_perspective", () ->
new Item(new Item.Properties().tab(ItemGroup.TAB_MISC))
new Item(new Item.Properties().tab(CreativeModeTab.TAB_MISC))
);
public NewModelLoaderTest()
@@ -151,7 +161,7 @@ public class NewModelLoaderTest
static class TestLoader implements IModelLoader<TestModel>
{
@Override
public void onResourceManagerReload(IResourceManager resourceManager)
public void onResourceManagerReload(ResourceManager resourceManager)
{
}
@@ -165,7 +175,7 @@ public class NewModelLoaderTest
static class TestModel implements ISimpleModelGeometry<TestModel>
{
@Override
public void addQuads(IModelConfiguration owner, IModelBuilder<?> modelBuilder, ModelBakery bakery, Function<RenderMaterial, TextureAtlasSprite> spriteGetter, IModelTransform modelTransform, ResourceLocation modelLocation)
public void addQuads(IModelConfiguration owner, IModelBuilder<?> modelBuilder, ModelBakery bakery, Function< net.minecraft.client.resources.model.Material, TextureAtlasSprite> spriteGetter, ModelState modelTransform, ResourceLocation modelLocation)
{
TextureAtlasSprite texture = spriteGetter.apply(owner.resolveTexture("particle"));
@@ -184,7 +194,7 @@ public class NewModelLoaderTest
private void putVertex(BakedQuadBuilder builder, int x, float y, float z, float u, float v, float red, float green, float blue)
{
ImmutableList<VertexFormatElement> elements = DefaultVertexFormats.BLOCK.getElements();
ImmutableList<VertexFormatElement> elements = DefaultVertexFormat.BLOCK.getElements();
for(int i=0;i<elements.size();i++)
{
switch(elements.get(i).getUsage())
@@ -209,7 +219,7 @@ public class NewModelLoaderTest
}
@Override
public Collection<RenderMaterial> getTextures(IModelConfiguration owner, Function<ResourceLocation, IUnbakedModel> modelGetter, Set<Pair<String, String>> missingTextureErrors)
public Collection< net.minecraft.client.resources.model.Material> getTextures(IModelConfiguration owner, Function<ResourceLocation, UnbakedModel> modelGetter, Set<Pair<String, String>> missingTextureErrors)
{
return Collections.singleton(owner.resolveTexture("particle"));
}
@@ -247,8 +257,8 @@ public class NewModelLoaderTest
withExistingParent(NewModelLoaderTest.separate_perspective.getId().getPath(), "forge:item/default")
.customLoader(SeparatePerspectiveModelBuilder::begin)
.base(nested().parent(getExistingFile(mcLoc("minecraft:item/coal"))))
.perspective(ItemCameraTransforms.TransformType.GUI, nested().parent(getExistingFile(mcLoc("minecraft:item/snowball"))))
.perspective(ItemCameraTransforms.TransformType.FIRST_PERSON_LEFT_HAND, nested().parent(getExistingFile(mcLoc("minecraft:item/bone"))))
.perspective(ItemTransforms.TransformType.GUI, nested().parent(getExistingFile(mcLoc("minecraft:item/snowball"))))
.perspective(ItemTransforms.TransformType.FIRST_PERSON_LEFT_HAND, nested().parent(getExistingFile(mcLoc("minecraft:item/bone"))))
.end();
}
}
@@ -263,15 +273,28 @@ public class NewModelLoaderTest
@Override
protected void registerStatesAndModels()
{
simpleBlock(NewModelLoaderTest.obj_block.get(), models()
BlockModelBuilder model = models()
.getBuilder(NewModelLoaderTest.obj_block.getId().getPath())
.customLoader(OBJLoaderBuilder::begin)
.modelLocation(new ResourceLocation("new_model_loader_test:models/item/sugar_glider.obj"))
.flipV(true)
.end()
.texture("qr", "minecraft:block/oak_planks")
.texture("particle", "#qr")
);
.texture("particle", "#qr");
getVariantBuilder(NewModelLoaderTest.obj_block.get())
.partialState()
.with(BlockStateProperties.HORIZONTAL_FACING, Direction.EAST)
.addModels(new ConfiguredModel(model, 0, 90, false))
.partialState()
.with(BlockStateProperties.HORIZONTAL_FACING, Direction.WEST)
.addModels(new ConfiguredModel(model, 0, 270, false))
.partialState()
.with(BlockStateProperties.HORIZONTAL_FACING, Direction.NORTH)
.addModels(new ConfiguredModel(model))
.partialState()
.with(BlockStateProperties.HORIZONTAL_FACING, Direction.SOUTH)
.addModels(new ConfiguredModel(model, 0, 180, false))
.partialState();
}
}
}
@@ -26,21 +26,21 @@ import javax.annotation.Nullable;
import com.google.common.collect.ImmutableList;
import net.minecraft.block.Block;
import net.minecraft.block.BlockState;
import net.minecraft.block.material.Material;
import net.minecraft.client.renderer.model.BakedQuad;
import net.minecraft.client.renderer.model.IBakedModel;
import net.minecraft.client.renderer.model.ItemOverrideList;
import net.minecraft.world.level.block.Block;
import net.minecraft.world.level.block.state.BlockState;
import net.minecraft.world.level.material.Material;
import net.minecraft.client.renderer.block.model.BakedQuad;
import net.minecraft.client.resources.model.BakedModel;
import net.minecraft.client.renderer.block.model.ItemOverrides;
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
import net.minecraft.item.BlockItem;
import net.minecraft.item.Item;
import net.minecraft.item.ItemGroup;
import net.minecraft.util.Direction;
import net.minecraft.util.ResourceLocation;
import net.minecraft.util.math.vector.Quaternion;
import net.minecraft.util.math.vector.TransformationMatrix;
import net.minecraft.util.math.vector.Vector3f;
import net.minecraft.world.item.BlockItem;
import net.minecraft.world.item.Item;
import net.minecraft.world.item.CreativeModeTab;
import net.minecraft.core.Direction;
import net.minecraft.resources.ResourceLocation;
import com.mojang.math.Quaternion;
import com.mojang.math.Transformation;
import com.mojang.math.Vector3f;
import net.minecraftforge.api.distmarker.Dist;
import net.minecraftforge.client.event.ModelBakeEvent;
import net.minecraftforge.client.model.data.IDynamicBakedModel;
@@ -50,7 +50,7 @@ import net.minecraftforge.client.model.pipeline.TRSRTransformer;
import net.minecraftforge.common.model.TransformationHelper;
import net.minecraftforge.eventbus.api.IEventBus;
import net.minecraftforge.fml.DistExecutor;
import net.minecraftforge.fml.RegistryObject;
import net.minecraftforge.fmllegacy.RegistryObject;
import net.minecraftforge.fml.common.Mod;
import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext;
import net.minecraftforge.registries.DeferredRegister;
@@ -64,7 +64,7 @@ public class TRSRTransformerTest {
private static final RegistryObject<Block> TEST_BLOCK = BLOCKS.register("test", () -> new Block(Block.Properties.of(Material.STONE)));
@SuppressWarnings("unused")
private static final RegistryObject<Item> TEST_ITEM = ITEMS.register("test", () -> new BlockItem(TEST_BLOCK.get(), new Item.Properties().tab(ItemGroup.TAB_MISC)));
private static final RegistryObject<Item> TEST_ITEM = ITEMS.register("test", () -> new BlockItem(TEST_BLOCK.get(), new Item.Properties().tab(CreativeModeTab.TAB_MISC)));
public TRSRTransformerTest() {
final IEventBus mod = FMLJavaModLoadingContext.get().getModEventBus();
@@ -82,9 +82,9 @@ public class TRSRTransformerTest {
}
public class MyBakedModel implements IDynamicBakedModel {
private final IBakedModel base;
private final BakedModel base;
public MyBakedModel(IBakedModel base) {
public MyBakedModel(BakedModel base) {
this.base = base;
}
@@ -95,7 +95,7 @@ public class TRSRTransformerTest {
Quaternion rot = TransformationHelper.quatFromXYZ(new Vector3f(0, 45, 0), true);
Vector3f translation = new Vector3f(0, 0.33f, 0);
TransformationMatrix trans = new TransformationMatrix(translation, rot, null, null).blockCenterToCorner();
Transformation trans = new Transformation(translation, rot, null, null).blockCenterToCorner();
for (BakedQuad quad : base.getQuads(state, side, rand, data)) {
@@ -143,7 +143,7 @@ public class TRSRTransformerTest {
}
@Override
public ItemOverrideList getOverrides() {
public ItemOverrides getOverrides() {
return base.getOverrides();
}
}
@@ -22,4 +22,4 @@
package net.minecraftforge.debug.client.model;
import javax.annotation.ParametersAreNonnullByDefault;
import mcp.MethodsReturnNonnullByDefault;
import net.minecraft.MethodsReturnNonnullByDefault;
@@ -19,7 +19,7 @@
package net.minecraftforge.debug.client.rendering;
import net.minecraft.client.gui.screen.MainMenuScreen;
import net.minecraft.client.gui.screens.TitleScreen;
import net.minecraftforge.client.ForgeRenderTypes;
import net.minecraftforge.client.event.GuiScreenEvent.DrawScreenEvent;
import net.minecraftforge.eventbus.api.SubscribeEvent;
@@ -36,7 +36,7 @@ public class LinearTextTextureFilteringTest
@SubscribeEvent
public static void onGuiRenderPre(DrawScreenEvent.Pre event)
{
if (ENABLED && event.getGui() instanceof MainMenuScreen)
if (ENABLED && event.getGui() instanceof TitleScreen)
{
ForgeRenderTypes.enableTextTextureLinearFiltering = true;
}
@@ -45,7 +45,7 @@ public class LinearTextTextureFilteringTest
@SubscribeEvent
public static void onGuiRenderPost(DrawScreenEvent.Post event)
{
if (ENABLED && event.getGui() instanceof MainMenuScreen)
if (ENABLED && event.getGui() instanceof TitleScreen)
{
ForgeRenderTypes.enableTextTextureLinearFiltering = false;
}
@@ -19,10 +19,10 @@
package net.minecraftforge.debug.client.rendering;
import net.minecraft.entity.passive.CowEntity;
import net.minecraft.entity.player.PlayerEntity;
import net.minecraft.util.text.StringTextComponent;
import net.minecraft.util.text.TextFormatting;
import net.minecraft.world.entity.animal.Cow;
import net.minecraft.world.entity.player.Player;
import net.minecraft.network.chat.TextComponent;
import net.minecraft.ChatFormatting;
import net.minecraftforge.client.event.RenderNameplateEvent;
import net.minecraftforge.eventbus.api.Event;
import net.minecraftforge.eventbus.api.SubscribeEvent;
@@ -46,15 +46,15 @@ public class NameplateRenderingEventTest
return;
}
if(event.getEntity() instanceof CowEntity)
if(event.getEntity() instanceof Cow)
{
event.setContent(new StringTextComponent("Evil Cow").withStyle(TextFormatting.RED));
event.setContent(new TextComponent("Evil Cow").withStyle(ChatFormatting.RED));
event.setResult(Event.Result.ALLOW);
}
if(event.getEntity() instanceof PlayerEntity)
if(event.getEntity() instanceof Player)
{
event.setContent(event.getEntity().getDisplayName().copy().withStyle(TextFormatting.GOLD));
event.setContent(event.getEntity().getDisplayName().copy().withStyle(ChatFormatting.GOLD));
}
}
}
@@ -20,8 +20,8 @@
package net.minecraftforge.debug.client.rendering;
import net.minecraft.client.Minecraft;
import net.minecraft.item.Items;
import net.minecraft.util.ActionResultType;
import net.minecraft.world.item.Items;
import net.minecraft.world.InteractionResult;
import net.minecraftforge.api.distmarker.Dist;
import net.minecraftforge.event.entity.player.PlayerInteractEvent;
import net.minecraftforge.eventbus.api.SubscribeEvent;
@@ -44,7 +44,7 @@ public class RenderLocalPlayerTest
{
mc.setCameraEntity(event.getTarget());
event.setCancellationResult(ActionResultType.SUCCESS);
event.setCancellationResult(InteractionResult.SUCCESS);
event.setCanceled(true);
}
}
@@ -60,7 +60,7 @@ public class RenderLocalPlayerTest
{
mc.setCameraEntity(mc.player);
event.setCancellationResult(ActionResultType.SUCCESS);
event.setCancellationResult(InteractionResult.SUCCESS);
event.setCanceled(true);
}
}
@@ -19,11 +19,11 @@
package net.minecraftforge.debug.client.rendering;
import net.minecraft.client.entity.player.ClientPlayerEntity;
import net.minecraft.util.ResourceLocation;
import net.minecraft.client.player.LocalPlayer;
import net.minecraft.resources.ResourceLocation;
import net.minecraftforge.api.distmarker.Dist;
import net.minecraftforge.eventbus.api.SubscribeEvent;
import net.minecraftforge.fml.client.registry.ClientRegistry;
import net.minecraftforge.fmlclient.registry.ClientRegistry;
import net.minecraftforge.fml.common.Mod;
import net.minecraftforge.fml.event.lifecycle.FMLClientSetupEvent;
@@ -34,6 +34,6 @@ public class ShaderFixTest
@SubscribeEvent
public static void clientSetup(final FMLClientSetupEvent event)
{
ClientRegistry.registerEntityShader(ClientPlayerEntity.class, new ResourceLocation("shaders/post/desaturate.json"));
ClientRegistry.registerEntityShader(LocalPlayer.class, new ResourceLocation("shaders/post/desaturate.json"));
}
}
@@ -22,4 +22,4 @@
package net.minecraftforge.debug.client.rendering;
import javax.annotation.ParametersAreNonnullByDefault;
import mcp.MethodsReturnNonnullByDefault;
import net.minecraft.MethodsReturnNonnullByDefault;