mirror of
https://github.com/MinecraftForge/MinecraftForge.git
synced 2026-11-22 13:09:59 +00:00
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:
1 parent
1f44339d6e
commit
44c689f171
347 files changed
+2545
-2436
No files matched your search
@@ -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
|
||||
}
|
||||
|
||||
|
||||
+3
-2
@@ -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;
|
||||
}
|
||||
|
||||
|
||||
Reference in new issue
Block a user