Forge 1.19.4

Properly move `ServerStatusPing` to codec
Reimplement custom display contexts

Co-authored-by: Matyrobbrt <[email protected]>
Co-authored-by: coehlrich <[email protected]>
Signed-off-by: SizableShrimp <[email protected]>
This commit is contained in:
committed 2023-03-14 17:22:27 -05:00
1 parent 1f44339d6e
commit 44c689f171
347 files changed
+2545 -2436

No files matched your search

@@ -94,6 +94,7 @@ import net.minecraft.world.entity.player.Player;
import net.minecraft.world.flag.FeatureFlagSet;
import net.minecraft.world.inventory.tooltip.TooltipComponent;
import net.minecraft.world.item.CreativeModeTab;
import net.minecraft.world.item.ItemDisplayContext;
import net.minecraft.world.item.ItemStack;
import net.minecraft.world.item.ItemStackLinkedSet;
import net.minecraft.world.item.crafting.RecipeManager;
@@ -154,6 +155,7 @@ import net.minecraftforge.fml.VersionChecker;
import net.minecraftforge.fml.common.Mod;
import net.minecraftforge.network.NetworkConstants;
import net.minecraftforge.network.NetworkRegistry;
import net.minecraftforge.network.ServerStatusPing;
import net.minecraftforge.registries.GameData;
import net.minecraftforge.versions.forge.ForgeVersion;
import org.apache.commons.lang3.tuple.Pair;
@@ -484,7 +486,7 @@ public class ForgeHooksClient
ModLoader.get().postEvent(new ModelEvent.BakingCompleted(modelManager, Collections.unmodifiableMap(models), modelBakery));
}
public static BakedModel handleCameraTransforms(PoseStack poseStack, BakedModel model, ItemTransforms.TransformType cameraTransformType, boolean applyLeftHandTransform)
public static BakedModel handleCameraTransforms(PoseStack poseStack, BakedModel model, ItemDisplayContext cameraTransformType, boolean applyLeftHandTransform)
{
model = model.applyTransform(cameraTransformType, poseStack, applyLeftHandTransform);
return model;
@@ -818,10 +820,11 @@ public class ForgeHooksClient
public static void processForgeListPingData(ServerStatus packet, ServerData target)
{
if (packet.getForgeData() != null) {
final Map<String, String> mods = packet.getForgeData().getRemoteModData();
final Map<ResourceLocation, Pair<String, Boolean>> remoteChannels = packet.getForgeData().getRemoteChannels();
final int fmlver = packet.getForgeData().getFMLNetworkVersion();
packet.forgeData().ifPresentOrElse(forgeData ->
{
final Map<String, String> mods = forgeData.getRemoteModData();
final Map<ResourceLocation, ServerStatusPing.ChannelData> remoteChannels = forgeData.getRemoteChannels();
final int fmlver = forgeData.getFMLNetworkVersion();
boolean fmlNetMatches = fmlver == NetworkConstants.FMLNETVERSION;
boolean channelsMatch = NetworkRegistry.checkListPingCompatibilityForClient(remoteChannels);
@@ -867,11 +870,8 @@ public class ForgeHooksClient
if (fmlver > NetworkConstants.FMLNETVERSION) {
extraReason = "fml.menu.multiplayer.clientoutdated";
}
target.forgeData = new ExtendedServerListData("FML", extraServerMods.isEmpty() && fmlNetMatches && channelsMatch && modsMatch, mods.size(), extraReason, packet.getForgeData().isTruncated());
} else {
target.forgeData = new ExtendedServerListData("VANILLA", NetworkRegistry.canConnectToVanillaServer(),0, null);
}
target.forgeData = new ExtendedServerListData("FML", extraServerMods.isEmpty() && fmlNetMatches && channelsMatch && modsMatch, mods.size(), extraReason, forgeData.isTruncated());
}, () -> target.forgeData = new ExtendedServerListData("VANILLA", NetworkRegistry.canConnectToVanillaServer(),0, null));
}
private static final ResourceLocation ICON_SHEET = new ResourceLocation(ForgeVersion.MOD_ID, "textures/gui/icons.png");
@@ -1202,7 +1202,7 @@ public class ForgeHooksClient
return new ResourceLocation(loc.getNamespace(), normalised);
}
public static void onCreativeModeTabBuildContents(CreativeModeTab tab, CreativeModeTab.DisplayItemsGenerator originalGenerator, FeatureFlagSet flags, CreativeModeTab.Output output, boolean hasPermisions)
public static void onCreativeModeTabBuildContents(CreativeModeTab tab, CreativeModeTab.DisplayItemsGenerator originalGenerator, CreativeModeTab.ItemDisplayParameters params, CreativeModeTab.Output output)
{
final var entries = new MutableHashedLinkedMap<ItemStack, CreativeModeTab.TabVisibility>(ItemStackLinkedSet.TYPE_AND_TAG,
(key, left, right) -> {
@@ -1213,13 +1213,13 @@ public class ForgeHooksClient
}
);
originalGenerator.accept(flags, (stack, vis) -> {
originalGenerator.accept(params, (stack, vis) -> {
if (stack.getCount() != 1)
throw new IllegalArgumentException("The stack count must be 1");
entries.put(stack, vis);
}, hasPermisions);
});
ModLoader.get().postEvent(new CreativeModeTabEvent.BuildContents(tab, flags, hasPermisions, entries));
ModLoader.get().postEvent(new CreativeModeTabEvent.BuildContents(tab, params, entries));
for (var entry : entries)
output.accept(entry.getKey(), entry.getValue());
@@ -371,7 +371,6 @@ public enum ForgeRenderTypes
this.setupState = () -> {
this.blur = blur.get();
this.mipmap = mipmap.get();
RenderSystem.enableTexture();
TextureManager texturemanager = Minecraft.getInstance().getTextureManager();
texturemanager.getTexture(resLoc).setFilter(this.blur, this.mipmap);
RenderSystem.setShaderTexture(0, resLoc);
@@ -65,7 +65,6 @@ public final class ItemDecoratorHandler
private void resetRenderState()
{
RenderSystem.enableTexture();
RenderSystem.enableDepthTest();
RenderSystem.enableBlend();
RenderSystem.defaultBlendFunc();
@@ -47,11 +47,18 @@ public class RegisterParticleProvidersEvent extends Event implements IModBusEven
* or a redundant texture list error will occur when particle jsons load.
* @param provider ParticleProvider responsible for providing that ParticleType's particles.
*/
@SuppressWarnings("deprecation")
public <T extends ParticleOptions> void register(ParticleType<T> type, ParticleProvider<T> provider)
{
particleEngine.register(type, provider);
}
@SuppressWarnings("deprecation")
public <T extends ParticleOptions> void register(ParticleType<T> type, ParticleProvider.Sprite<T> sprite)
{
particleEngine.register(type, sprite);
}
/**
* Registers a ParticleProvider for a json-based ParticleType.
* Particle jsons define a list of texture sprites which the particle can use to render itself.
@@ -61,6 +68,7 @@ public class RegisterParticleProvidersEvent extends Event implements IModBusEven
* or a missing texture list error will occur when particle jsons load.
* @param registration SpriteParticleRegistration responsible for providing that ParticleType's particles.
*/
@SuppressWarnings("deprecation")
public <T extends ParticleOptions> void register(ParticleType<T> type, ParticleEngine.SpriteParticleRegistration<T> registration)
{
particleEngine.register(type, registration);
@@ -15,6 +15,7 @@ import net.minecraft.client.resources.model.BakedModel;
import net.minecraft.core.BlockPos;
import net.minecraft.core.Direction;
import net.minecraft.util.RandomSource;
import net.minecraft.world.item.ItemDisplayContext;
import net.minecraft.world.item.ItemStack;
import net.minecraft.world.level.BlockAndTintGetter;
import net.minecraft.world.level.block.state.BlockState;
@@ -59,7 +60,7 @@ public interface IForgeBakedModel
* Applies a transform for the given {@link ItemTransforms.TransformType} and {@code applyLeftHandTransform}, and
* returns the model to be rendered.
*/
default BakedModel applyTransform(ItemTransforms.TransformType transformType, PoseStack poseStack, boolean applyLeftHandTransform)
default BakedModel applyTransform(ItemDisplayContext transformType, PoseStack poseStack, boolean applyLeftHandTransform)
{
self().getTransforms().getTransform(transformType).apply(applyLeftHandTransform, poseStack);
return self();
@@ -45,6 +45,6 @@ public interface IForgeMinecraft
*/
default Locale getLocale()
{
return self().getLanguageManager().getSelected().getJavaLocale();
return self().getLanguageManager().getJavaLocale();
}
}
@@ -283,7 +283,7 @@ public class ModListScreen extends Screen
this.addRenderableWidget(configButton);
this.addRenderableWidget(openModsFolderButton);
search.setFocus(false);
search.setFocused(false);
search.setCanLoseFocus(true);
configButton.active = false;
@@ -212,7 +212,6 @@ public class ScreenUtils
float endBlue = (float)(endColor & 255) / 255.0F;
RenderSystem.enableDepthTest();
RenderSystem.disableTexture();
RenderSystem.enableBlend();
RenderSystem.defaultBlendFunc();
RenderSystem.setShader(GameRenderer::getPositionColorShader);
@@ -227,7 +226,6 @@ public class ScreenUtils
tessellator.end();
RenderSystem.disableBlend();
RenderSystem.enableTexture();
}
public static void blitInscribed(PoseStack poseStack, int x, int y, int boundsWidth, int boundsHeight, int rectWidth, int rectHeight)
@@ -105,13 +105,8 @@ public class ForgeGui extends Gui
if (texture != null)
{
RenderSystem.enableTexture();
bind(texture);
}
else
{
RenderSystem.disableTexture();
}
RenderSystem.setShaderColor(1.0F, 1.0F, 1.0F, 1.0F);
RenderSystem.setShader(GameRenderer::getPositionTexShader);
@@ -172,7 +167,7 @@ public class ForgeGui extends Gui
minecraft.getProfiler().pop();
}
void renderSpyglassOverlay()
void renderSpyglassOverlay(PoseStack stack)
{
float deltaFrame = this.minecraft.getDeltaFrameTime();
this.scopeScale = Mth.lerp(0.5F * deltaFrame, this.scopeScale, 1.125F);
@@ -180,7 +175,7 @@ public class ForgeGui extends Gui
{
if (this.minecraft.player.isScoping())
{
this.renderSpyglassOverlay(this.scopeScale);
this.renderSpyglassOverlay(stack, this.scopeScale);
}
else
{
@@ -198,7 +193,7 @@ public class ForgeGui extends Gui
Item item = itemstack.getItem();
if (item == Blocks.CARVED_PUMPKIN.asItem())
{
renderTextureOverlay(PUMPKIN_BLUR_LOCATION, 1.0F);
renderTextureOverlay(poseStack, PUMPKIN_BLUR_LOCATION, 1.0F);
}
else
{
@@ -211,7 +206,7 @@ public class ForgeGui extends Gui
{
if (this.minecraft.player.getTicksFrozen() > 0)
{
this.renderTextureOverlay(POWDER_SNOW_OUTLINE_LOCATION, this.minecraft.player.getPercentFrozen());
this.renderTextureOverlay(pStack, POWDER_SNOW_OUTLINE_LOCATION, this.minecraft.player.getPercentFrozen());
}
}
@@ -247,13 +242,13 @@ public class ForgeGui extends Gui
}
@Override
protected void renderPortalOverlay(float partialTick)
protected void renderPortalOverlay(PoseStack stack, float partialTick)
{
float f1 = Mth.lerp(partialTick, this.minecraft.player.oPortalTime, this.minecraft.player.portalTime);
if (f1 > 0.0F)
{
super.renderPortalOverlay(f1);
super.renderPortalOverlay(stack, f1);
}
}
@@ -27,12 +27,12 @@ public enum VanillaGuiOverlay
if (Minecraft.useFancyGraphics())
{
gui.setupOverlayRenderState(true, false);
gui.renderVignette(gui.getMinecraft().getCameraEntity());
gui.renderVignette(poseStack, gui.getMinecraft().getCameraEntity());
}
}),
SPYGLASS("spyglass", (gui, poseStack, partialTick, screenWidth, screenHeight) -> {
gui.setupOverlayRenderState(true, false);
gui.renderSpyglassOverlay();
gui.renderSpyglassOverlay(poseStack);
}),
HELMET("helmet", (gui, poseStack, partialTick, screenWidth, screenHeight) -> {
gui.setupOverlayRenderState(true, false);
@@ -47,7 +47,7 @@ public enum VanillaGuiOverlay
if (!gui.getMinecraft().player.hasEffect(MobEffects.CONFUSION))
{
gui.setupOverlayRenderState(true, false);
gui.renderPortalOverlay(partialTick);
gui.renderPortalOverlay(poseStack, partialTick);
}
}),
@@ -69,18 +69,22 @@ public enum VanillaGuiOverlay
if (!gui.getMinecraft().options.hideGui)
{
gui.setupOverlayRenderState(true, false);
gui.setBlitOffset(-90);
poseStack.pushPose();
poseStack.translate(0, 0, -90);
gui.renderCrosshair(poseStack);
poseStack.popPose();
}
}),
BOSS_EVENT_PROGRESS("boss_event_progress", (gui, poseStack, partialTick, screenWidth, screenHeight) -> {
if (!gui.getMinecraft().options.hideGui)
{
gui.setupOverlayRenderState(true, false);
gui.setBlitOffset(-90);
poseStack.pushPose();
poseStack.translate(0, 0, -90);
gui.renderBossHealth(poseStack);
poseStack.popPose();
}
}),
PLAYER_HEALTH("player_health", (gui, poseStack, partialTick, screenWidth, screenHeight) -> {
@@ -138,7 +142,7 @@ public enum VanillaGuiOverlay
if (!gui.getMinecraft().options.hideGui)
{
gui.setupOverlayRenderState(true, false);
if (gui.getMinecraft().options.heldItemTooltips && gui.getMinecraft().gameMode.getPlayerMode() != GameType.SPECTATOR)
if (gui.getMinecraft().gameMode.getPlayerMode() != GameType.SPECTATOR)
{
gui.renderSelectedItemName(poseStack);
}
@@ -44,12 +44,11 @@ public class ExtendedButton extends Button
* Draws this button to the screen.
*/
@Override
public void renderButton(PoseStack poseStack, int mouseX, int mouseY, float partialTick)
public void renderWidget(PoseStack poseStack, int mouseX, int mouseY, float partialTick)
{
Minecraft mc = Minecraft.getInstance();
int k = this.getYImage(this.isHoveredOrFocused());
ScreenUtils.blitWithBorder(poseStack, WIDGETS_LOCATION, this.getX(), this.getY(), 0, 46 + k * 20, this.width, this.height, 200, 20, 2, 3, 2, 2, this.getBlitOffset());
this.renderBg(poseStack, mc, mouseX, mouseY);
int k = !this.active ? 0 : (this.isHoveredOrFocused() ? 2 : 1);
ScreenUtils.blitWithBorder(poseStack, WIDGETS_LOCATION, this.getX(), this.getY(), 0, 46 + k * 20, this.width, this.height, 200, 20, 2, 3, 2, 2, 0);
final FormattedText buttonText = mc.font.ellipsize(this.getMessage(), this.width - 6); // Remove 6 pixels so that the text is always contained within the button's borders
drawCenteredString(poseStack, mc.font, Language.getInstance().getVisualOrder(buttonText), this.getX() + this.width / 2, this.getY() + (this.height - 8) / 2, getFGColor());
@@ -226,17 +226,17 @@ public class ForgeSlider extends AbstractSliderButton
protected void applyValue() {}
@Override
public void renderButton(@NotNull PoseStack poseStack, int mouseX, int mouseY, float partialTick)
public void renderWidget(@NotNull PoseStack poseStack, int mouseX, int mouseY, float partialTick)
{
RenderSystem.setShader(GameRenderer::getPositionTexShader);
RenderSystem.setShaderTexture(0, WIDGETS_LOCATION);
final Minecraft mc = Minecraft.getInstance();
final int bgYImage = this.getYImage(this.isHoveredOrFocused());
ScreenUtils.blitWithBorder(poseStack, this.getX(), this.getY(), 0, 46 + bgYImage * 20, this.width, this.height, 200, 20, 2, 3, 2, 2, this.getBlitOffset());
final int bgYImage = !this.active ? 0 : (this.isHoveredOrFocused() ? 2 : 1);
ScreenUtils.blitWithBorder(poseStack, this.getX(), this.getY(), 0, 46 + bgYImage * 20, this.width, this.height, 200, 20, 2, 3, 2, 2, 0);
final int sliderYImage = (this.isHoveredOrFocused() ? 2 : 1) * 20;
ScreenUtils.blitWithBorder(poseStack, this.getX() + (int)(this.value * (double)(this.width - 8)), this.getY(), 0, 46 + sliderYImage, 8, this.height, 200, 20 , 2, 3, 2, 2, this.getBlitOffset());
ScreenUtils.blitWithBorder(poseStack, this.getX() + (int)(this.value * (double)(this.width - 8)), this.getY(), 0, 46 + sliderYImage, 8, this.height, 200, 20 , 2, 3, 2, 2, 0);
final FormattedText message = mc.font.ellipsize(getMessage(), this.width - 6);
drawCenteredString(poseStack, mc.font, Language.getInstance().getVisualOrder(message), this.getX() + this.width / 2, this.getY() + (this.height - 8) / 2, getFGColor());
@@ -328,7 +328,6 @@ public abstract class ScrollPanel extends AbstractContainerEventHandler implemen
int barBgBlue = this.barBgColor & 0xff;
RenderSystem.setShader(GameRenderer::getPositionColorShader);
RenderSystem.disableTexture();
worldr.begin(VertexFormat.Mode.QUADS, DefaultVertexFormat.POSITION_COLOR);
worldr.vertex(barLeft, this.bottom, 0.0D).color(barBgRed, barBgGreen, barBgBlue, barBgAlpha).endVertex();
worldr.vertex(barLeft + barWidth, this.bottom, 0.0D).color(barBgRed, barBgGreen, barBgBlue, barBgAlpha).endVertex();
@@ -361,7 +360,6 @@ public abstract class ScrollPanel extends AbstractContainerEventHandler implemen
tess.end();
}
RenderSystem.enableTexture();
RenderSystem.disableBlend();
RenderSystem.disableScissor();
}
@@ -35,9 +35,8 @@ public class UnicodeGlyphButton extends ExtendedButton
{
Minecraft mc = Minecraft.getInstance();
this.isHovered = mouseX >= this.getX() && mouseY >= this.getY() && mouseX < this.getX() + this.width && mouseY < this.getY() + this.height;
int k = this.getYImage(this.isHoveredOrFocused());
ScreenUtils.blitWithBorder(poseStack, WIDGETS_LOCATION, this.getX(), this.getY(), 0, 46 + k * 20, this.width, this.height, 200, 20, 2, 3, 2, 2, this.getBlitOffset());
this.renderBg(poseStack, mc, mouseX, mouseY);
int k = !this.active ? 0 : (this.isHoveredOrFocused() ? 2 : 1);
ScreenUtils.blitWithBorder(poseStack, WIDGETS_LOCATION, this.getX(), this.getY(), 0, 46 + k * 20, this.width, this.height, 200, 20, 2, 3, 2, 2, 0);
Component buttonText = this.createNarrationMessage();
int glyphWidth = (int) (mc.font.width(glyph) * glyphScale);
@@ -140,8 +140,6 @@ public class ClientModLoader
public static boolean completeModLoading()
{
RenderSystem.disableTexture();
RenderSystem.enableTexture();
List<ModLoadingWarning> warnings = ModLoader.get().getWarnings();
boolean showWarnings = true;
try {
@@ -209,7 +207,7 @@ public class ClientModLoader
// Create a resource pack merging all mod resources that should be hidden
final Pack modResourcesPack = Pack.readMetaAndCreate("mod_resources", Component.literal("Mod Resources"), true,
id -> new DelegatingPackResources(id, false, new PackMetadataSection(Component.translatable("fml.resources.modresources", hiddenPacks.size()),
PackType.CLIENT_RESOURCES.getVersion(SharedConstants.getCurrentVersion())), hiddenPacks),
SharedConstants.getCurrentVersion().getPackVersion(PackType.CLIENT_RESOURCES)), hiddenPacks),
PackType.CLIENT_RESOURCES, Pack.Position.BOTTOM, PackSource.DEFAULT);
packAcceptor.accept(modResourcesPack);
}
@@ -15,6 +15,7 @@ import net.minecraft.client.resources.model.BakedModel;
import net.minecraft.core.BlockPos;
import net.minecraft.core.Direction;
import net.minecraft.util.RandomSource;
import net.minecraft.world.item.ItemDisplayContext;
import net.minecraft.world.item.ItemStack;
import net.minecraft.world.level.BlockAndTintGetter;
import net.minecraft.world.level.block.state.BlockState;
@@ -100,7 +101,7 @@ public abstract class BakedModelWrapper<T extends BakedModel> implements BakedMo
}
@Override
public BakedModel applyTransform(ItemTransforms.TransformType cameraTransformType, PoseStack poseStack, boolean applyLeftHandTransform)
public BakedModel applyTransform(ItemDisplayContext cameraTransformType, PoseStack poseStack, boolean applyLeftHandTransform)
{
return originalModel.applyTransform(cameraTransformType, poseStack, applyLeftHandTransform);
}
@@ -29,6 +29,7 @@ import net.minecraft.core.Direction;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.util.GsonHelper;
import net.minecraft.util.RandomSource;
import net.minecraft.world.item.ItemDisplayContext;
import net.minecraft.world.level.block.state.BlockState;
import net.minecraftforge.client.ChunkRenderTypeSet;
import net.minecraftforge.client.model.data.ModelData;
@@ -41,22 +42,22 @@ import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
/**
* A model composed of multiple sub-models which are picked based on the {@link ItemTransforms.TransformType} being used.
* A model composed of multiple sub-models which are picked based on the {@link ItemDisplayContext} being used.
*/
public class SeparateTransformsModel implements IUnbakedGeometry<SeparateTransformsModel>
{
private static final Logger LOGGER = LogManager.getLogger();
private final BlockModel baseModel;
private final ImmutableMap<ItemTransforms.TransformType, BlockModel> perspectives;
private final ImmutableMap<ItemDisplayContext, BlockModel> perspectives;
private final boolean deprecatedLoader;
public SeparateTransformsModel(BlockModel baseModel, ImmutableMap<ItemTransforms.TransformType, BlockModel> perspectives)
public SeparateTransformsModel(BlockModel baseModel, ImmutableMap<ItemDisplayContext, BlockModel> perspectives)
{
this(baseModel, perspectives, false);
}
private SeparateTransformsModel(BlockModel baseModel, ImmutableMap<ItemTransforms.TransformType, BlockModel> perspectives, boolean deprecatedLoader)
private SeparateTransformsModel(BlockModel baseModel, ImmutableMap<ItemDisplayContext, BlockModel> perspectives, boolean deprecatedLoader)
{
this.baseModel = baseModel;
this.perspectives = perspectives;
@@ -94,9 +95,9 @@ public class SeparateTransformsModel implements IUnbakedGeometry<SeparateTransfo
private final TextureAtlasSprite particle;
private final ItemOverrides overrides;
private final BakedModel baseModel;
private final ImmutableMap<ItemTransforms.TransformType, BakedModel> perspectives;
private final ImmutableMap<ItemDisplayContext, BakedModel> perspectives;
public Baked(boolean isAmbientOcclusion, boolean isGui3d, boolean isSideLit, TextureAtlasSprite particle, ItemOverrides overrides, BakedModel baseModel, ImmutableMap<ItemTransforms.TransformType, BakedModel> perspectives)
public Baked(boolean isAmbientOcclusion, boolean isGui3d, boolean isSideLit, TextureAtlasSprite particle, ItemOverrides overrides, BakedModel baseModel, ImmutableMap<ItemDisplayContext, BakedModel> perspectives)
{
this.isAmbientOcclusion = isAmbientOcclusion;
this.isGui3d = isGui3d;
@@ -157,7 +158,7 @@ public class SeparateTransformsModel implements IUnbakedGeometry<SeparateTransfo
}
@Override
public BakedModel applyTransform(ItemTransforms.TransformType cameraTransformType, PoseStack poseStack, boolean applyLeftHandTransform)
public BakedModel applyTransform(ItemDisplayContext cameraTransformType, PoseStack poseStack, boolean applyLeftHandTransform)
{
if (perspectives.containsKey(cameraTransformType))
{
@@ -194,12 +195,12 @@ public class SeparateTransformsModel implements IUnbakedGeometry<SeparateTransfo
JsonObject perspectiveData = GsonHelper.getAsJsonObject(jsonObject, "perspectives");
Map<ItemTransforms.TransformType, BlockModel> perspectives = new HashMap<>();
for (ItemTransforms.TransformType transform : ItemTransforms.TransformType.values())
Map<ItemDisplayContext, BlockModel> perspectives = new HashMap<>();
for (ItemDisplayContext transform : ItemDisplayContext.values())
{
if (perspectiveData.has(transform.getSerializeName()))
if (perspectiveData.has(transform.getSerializedName()))
{
BlockModel perspectiveModel = deserializationContext.deserialize(GsonHelper.getAsJsonObject(perspectiveData, transform.getSerializeName()), BlockModel.class);
BlockModel perspectiveModel = deserializationContext.deserialize(GsonHelper.getAsJsonObject(perspectiveData, transform.getSerializedName()), BlockModel.class);
perspectives.put(transform, perspectiveModel);
}
}
@@ -27,12 +27,12 @@ import net.minecraft.client.renderer.block.model.BlockModel.GuiLight;
import net.minecraft.client.renderer.block.model.BlockElement;
import net.minecraft.client.renderer.block.model.BlockElementFace;
import net.minecraft.client.renderer.block.model.BlockElementRotation;
import net.minecraft.client.renderer.block.model.ItemTransforms.TransformType;
import net.minecraft.client.renderer.block.model.ItemTransform;
import net.minecraft.client.renderer.texture.MissingTextureAtlasSprite;
import net.minecraft.core.Direction;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.util.Mth;
import net.minecraft.world.item.ItemDisplayContext;
import net.minecraftforge.client.model.ForgeFaceData;
import net.minecraftforge.common.data.ExistingFileHelper;
import org.jetbrains.annotations.Nullable;
@@ -245,10 +245,10 @@ public class ModelBuilder<T extends ModelBuilder<T>> extends ModelFile {
root.addProperty("render_type", this.renderType);
}
Map<TransformType, ItemTransform> transforms = this.transforms.build();
Map<ItemDisplayContext, ItemTransform> transforms = this.transforms.build();
if (!transforms.isEmpty()) {
JsonObject display = new JsonObject();
for (Entry<TransformType, ItemTransform> e : transforms.entrySet()) {
for (Entry<ItemDisplayContext, ItemTransform> e : transforms.entrySet()) {
JsonObject transform = new JsonObject();
ItemTransform vec = e.getValue();
if (vec.equals(ItemTransform.NO_TRANSFORM)) continue;
@@ -265,7 +265,7 @@ public class ModelBuilder<T extends ModelBuilder<T>> extends ModelFile {
if (hasRightRotation) {
transform.add("right_rotation", serializeVector3f(vec.rightRotation));
}
display.add(e.getKey().getSerializeName(), transform);
display.add(e.getKey().getSerializedName(), transform);
}
root.add("display", display);
}
@@ -716,7 +716,7 @@ public class ModelBuilder<T extends ModelBuilder<T>> extends ModelFile {
public class TransformsBuilder {
private final Map<TransformType, TransformVecBuilder> transforms = new LinkedHashMap<>();
private final Map<ItemDisplayContext, TransformVecBuilder> transforms = new LinkedHashMap<>();
/**
* Begin building a new transform for the given perspective.
@@ -725,12 +725,12 @@ public class ModelBuilder<T extends ModelBuilder<T>> extends ModelFile {
* @return the builder for the given perspective
* @throws NullPointerException if {@code type} is {@code null}
*/
public TransformVecBuilder transform(TransformType type) {
public TransformVecBuilder transform(ItemDisplayContext type) {
Preconditions.checkNotNull(type, "Perspective cannot be null");
return transforms.computeIfAbsent(type, TransformVecBuilder::new);
}
Map<TransformType, ItemTransform> build() {
Map<ItemDisplayContext, ItemTransform> build() {
return this.transforms.entrySet().stream()
.collect(Collectors.toMap(Map.Entry::getKey, e -> e.getValue().build(), (k1, k2) -> { throw new IllegalArgumentException(); }, LinkedHashMap::new));
}
@@ -744,7 +744,7 @@ public class ModelBuilder<T extends ModelBuilder<T>> extends ModelFile {
private Vector3f scale = new Vector3f(ItemTransform.Deserializer.DEFAULT_SCALE);
private Vector3f rightRotation = new Vector3f(ItemTransform.Deserializer.DEFAULT_ROTATION);
TransformVecBuilder(TransformType type) {
TransformVecBuilder(ItemDisplayContext type) {
// param unused for functional match
}
@@ -9,6 +9,7 @@ import com.google.common.base.Preconditions;
import com.google.gson.JsonObject;
import net.minecraft.client.renderer.block.model.ItemTransforms;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.world.item.ItemDisplayContext;
import net.minecraftforge.client.model.generators.CustomLoaderBuilder;
import net.minecraftforge.client.model.generators.ModelBuilder;
import net.minecraftforge.common.data.ExistingFileHelper;
@@ -38,11 +39,11 @@ public class SeparateTransformsModelBuilder<T extends ModelBuilder<T>> extends C
return this;
}
public SeparateTransformsModelBuilder<T> perspective(ItemTransforms.TransformType perspective, T modelBuilder)
public SeparateTransformsModelBuilder<T> perspective(ItemDisplayContext perspective, T modelBuilder)
{
Preconditions.checkNotNull(perspective, "layer must not be null");
Preconditions.checkNotNull(modelBuilder, "modelBuilder must not be null");
childModels.put(perspective.getSerializeName(), modelBuilder);
childModels.put(perspective.getSerializedName(), modelBuilder);
return this;
}