Skip to content

Commit 656df0c

Browse files
Revert "Port to 1.21.2 (Expected to support 1.21.3)"
This reverts commit d936f70.
1 parent 4832329 commit 656df0c

File tree

3 files changed

+15
-15
lines changed

3 files changed

+15
-15
lines changed

common/src/main/java/me/pandamods/pandalib/client/render/PLRenderType.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,15 +17,14 @@
1717
import net.minecraft.Util;
1818
import net.minecraft.client.renderer.RenderType;
1919
import net.minecraft.resources.ResourceLocation;
20-
import net.minecraft.util.TriState;
2120

2221
import java.util.function.Function;
2322

2423
public class PLRenderType extends RenderType {
2524
public static final Function<ResourceLocation, RenderType> CUTOUT_MESH_ENTITY = Util.memoize((resourceLocation) -> {
2625
CompositeState compositeState = CompositeState.builder()
2726
.setShaderState(RENDERTYPE_ENTITY_CUTOUT_SHADER)
28-
.setTextureState(new TextureStateShard(resourceLocation, TriState.FALSE, false))
27+
.setTextureState(new TextureStateShard(resourceLocation, false, false))
2928
.setTransparencyState(NO_TRANSPARENCY).setLightmapState(LIGHTMAP).setOverlayState(OVERLAY)
3029
.createCompositeState(true);
3130
return create("cutout_mesh_entity", DefaultVertexFormat.NEW_ENTITY, VertexFormat.Mode.TRIANGLES, 1536,

common/src/main/java/me/pandamods/pandalib/resource/AssimpResources.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,8 +65,9 @@ public static Animation getAnimation(ResourceLocation resourceLocation) {
6565
}
6666

6767
@Override
68-
public CompletableFuture<Void> reload(PreparationBarrier preparationBarrier, ResourceManager resourceManager,
69-
Executor backgroundExecutor, Executor gameExecutor) {
68+
public @NotNull CompletableFuture<Void> reload(PreparationBarrier preparationBarrier, ResourceManager resourceManager,
69+
ProfilerFiller preparationsProfiler, ProfilerFiller reloadProfiler,
70+
Executor backgroundExecutor, Executor gameExecutor) {
7071
List<AIScene> scenes = new ObjectArrayList<>();
7172

7273
Map<ResourceLocation, Model> models = new Object2ObjectOpenHashMap<>();

gradle.properties

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3,18 +3,18 @@ java_version = 21
33

44
#### Minecraft ####
55

6-
minecraft_version = 1.21.2
6+
minecraft_version = 1.21
77
supported_mod_loaders = fabric,neoforge
88

9-
fabric_version = 0.16.9
10-
fabric_api_version = 0.106.1+1.21.2
11-
fabric_version_range = >=1.21.2 <1.22
9+
fabric_version = 0.16.4
10+
fabric_api_version = 0.102.0+1.21
11+
fabric_version_range = >=1.21 <1.22
1212

13-
neoforge_version = 21.2.1-beta
14-
neoforge_version_range = [1.21.2,1.22)
13+
neoforge_version = 21.0.167
14+
neoforge_version_range = [1.21,1.22)
1515

1616
parchment_minecraft_version = 1.21
17-
parchment_version = 2024.11.10
17+
parchment_version = 2024.07.28
1818

1919
#### Mod ####
2020

@@ -40,18 +40,18 @@ project_github_repo = PandaMods-Dev/PandaLib
4040
## publishing ##
4141
publishing_dry_run = false
4242

43-
publishing_minecraft_version = 1.21.2
43+
publishing_minecraft_version = 1.21
4444

4545
# Uncomment the next line to publish to versions in the range of 'publishing_minecraft_version'
4646
# and 'publishing_latest_minecraft_version'
47-
publishing_latest_minecraft_version = 1.21.3
47+
publishing_latest_minecraft_version = 1.21.1
4848

4949
# 0 = STABLE | 1 = BETA | 2 = ALPHA
5050
publishing_release_type = 1
5151

5252
#### Mods Dependencies ####
53-
deps_modmenu_version = 12.0.0-beta.1
54-
deps_architectury_version = 14.0.4
53+
deps_modmenu_version = 11.0.1
54+
deps_architectury_version = 13.0.8
5555

5656
#### Dependencies ####
5757
deps_lwjgl_version = 3.3.3

0 commit comments

Comments
 (0)