Skip to content

Commit ee147f1

Browse files
shedanielshedaniel
committed
Release 1.11.6, Fix #425, Fix #424, Fix #422
Signed-off-by: shedaniel <daniel@shedaniel.me>
1 parent 637ed17 commit ee147f1

File tree

9 files changed

+26
-28
lines changed

9 files changed

+26
-28
lines changed

‎.github/workflows/build.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
- name: Setup Java
1111
uses: actions/setup-java@v1
1212
with:
13-
java-version: 1.8
13+
java-version: 11
1414
- name: Grant execute permission for gradlew
1515
run: chmod +x gradlew
1616
- name: Build with Gradle

‎astromine-core/src/main/java/com/github/chainmailstudios/astromine/registry/client/AstromineBlockEntityRenderers.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
public class AstromineBlockEntityRenderers {
3737
public static void initialize() {}
3838

39-
public static <B extends BlockEntity, C extends BlockEntityType<B>> void register(C c, Function<BlockEntityRenderDispatcher, BlockEntityRenderer<B>> b) {
39+
public static <B extends BlockEntity, C extends BlockEntityType<B>> void register(C c, Function<BlockEntityRenderDispatcher, BlockEntityRenderer<? super B>> b) {
4040
BlockEntityRendererRegistry.INSTANCE.register(c, b);
4141
}
4242
}

‎astromine-core/src/main/resources/astromine-core.accesswidener‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
accessWidener v1 named
22

33
accessible method net/minecraft/block/FluidBlock <init> (Lnet/minecraft/fluid/FlowableFluid;Lnet/minecraft/block/AbstractBlock$Settings;)V
4-
accessible method net/minecraft/com.github.chainmailstudios.astromine.technologies.client.particle/DefaultParticleType <init> (Z)V
4+
accessible method net/minecraft/particle/DefaultParticleType <init> (Z)V
55
accessible method net/minecraft/item/Item rayTrace (Lnet/minecraft/world/World;Lnet/minecraft/entity/player/PlayerEntity;Lnet/minecraft/world/RayTraceContext$FluidHandling;)Lnet/minecraft/util/hit/BlockHitResult
66
accessible method net/minecraft/recipe/RecipeManager getAllOfType (Lnet/minecraft/recipe/RecipeType;)Ljava/util/Map;
77
accessible field net/minecraft/block/EntityShapeContext heldItem Lnet/minecraft/item/Item;

‎astromine-discoveries/src/main/java/com/github/chainmailstudios/astromine/discoveries/registry/client/AstromineDiscoveriesBlockEntityRenderers.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ public static void initialize() {
4242
register(AstromineDiscoveriesBlockEntityTypes.ALTAR, AltarBlockEntityRenderer::new);
4343
}
4444

45-
public static <B extends BlockEntity, C extends BlockEntityType<B>> void register(C c, Function<BlockEntityRenderDispatcher, BlockEntityRenderer<B>> b) {
45+
public static <B extends BlockEntity, C extends BlockEntityType<B>> void register(C c, Function<BlockEntityRenderDispatcher, BlockEntityRenderer<? super B>> b) {
4646
AstromineBlockEntityRenderers.register(c, b);
4747
}
4848
}

‎astromine-technologies/src/main/resources/astromine-technologies.accesswidener‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@ accessWidener v1 named
22

33
accessible method net/minecraft/block/FluidBlock <init> (Lnet/minecraft/fluid/FlowableFluid;Lnet/minecraft/block/AbstractBlock$Settings;)V
44
accessible method net/minecraft/block/StairsBlock <init> (Lnet/minecraft/block/BlockState;Lnet/minecraft/block/AbstractBlock$Settings;)V
5-
accessible method net/minecraft/com.github.chainmailstudios.astromine.technologies.client.particle/DefaultParticleType <init> (Z)V
5+
accessible method net/minecraft/particle/DefaultParticleType <init> (Z)V
66
accessible method net/minecraft/item/Item rayTrace (Lnet/minecraft/world/World;Lnet/minecraft/entity/player/PlayerEntity;Lnet/minecraft/world/RayTraceContext$FluidHandling;)Lnet/minecraft/util/hit/BlockHitResult
77
accessible method net/minecraft/recipe/RecipeManager getAllOfType (Lnet/minecraft/recipe/RecipeType;)Ljava/util/Map;
88
accessible method net/minecraft/entity/SpawnRestriction register (Lnet/minecraft/entity/EntityType;Lnet/minecraft/entity/SpawnRestriction$Location;Lnet/minecraft/world/Heightmap$Type;Lnet/minecraft/entity/SpawnRestriction$SpawnPredicate;)V
9-
accessible method net/minecraft/client/com.github.chainmailstudios.astromine.technologies.client.particle/CrackParticle <init> (Lnet/minecraft/client/world/ClientWorld;DDDLnet/minecraft/item/ItemStack;)V
9+
accessible method net/minecraft/client/particle/CrackParticle <init> (Lnet/minecraft/client/world/ClientWorld;DDDLnet/minecraft/item/ItemStack;)V
1010
accessible field net/minecraft/block/EntityShapeContext heldItem Lnet/minecraft/item/Item;
1111
accessible method net/minecraft/block/TallPlantBlock onBreakInCreative (Lnet/minecraft/world/World;Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/block/BlockState;Lnet/minecraft/entity/player/PlayerEntity;)V
1212
accessible field net/minecraft/util/DyeColor color I

‎astromine-transportations/src/main/resources/astromine-transportations.accesswidener‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ accessWidener v1 named
22

33
accessible method net/minecraft/block/FluidBlock <init> (Lnet/minecraft/fluid/FlowableFluid;Lnet/minecraft/block/AbstractBlock$Settings;)V
44
accessible method net/minecraft/block/StairsBlock <init> (Lnet/minecraft/block/BlockState;Lnet/minecraft/block/AbstractBlock$Settings;)V
5-
accessible method net/minecraft/com.github.chainmailstudios.astromine.technologies.client.particle/DefaultParticleType <init> (Z)V
5+
accessible method net/minecraft/particle/DefaultParticleType <init> (Z)V
66
accessible method net/minecraft/item/Item rayTrace (Lnet/minecraft/world/World;Lnet/minecraft/entity/player/PlayerEntity;Lnet/minecraft/world/RayTraceContext$FluidHandling;)Lnet/minecraft/util/hit/BlockHitResult
77
accessible method net/minecraft/recipe/RecipeManager getAllOfType (Lnet/minecraft/recipe/RecipeType;)Ljava/util/Map;
88
accessible method net/minecraft/entity/SpawnRestriction register (Lnet/minecraft/entity/EntityType;Lnet/minecraft/entity/SpawnRestriction$Location;Lnet/minecraft/world/Heightmap$Type;Lnet/minecraft/entity/SpawnRestriction$SpawnPredicate;)V
9-
accessible method net/minecraft/client/com.github.chainmailstudios.astromine.technologies.client.particle/CrackParticle <init> (Lnet/minecraft/client/world/ClientWorld;DDDLnet/minecraft/item/ItemStack;)V
9+
accessible method net/minecraft/client/particle/CrackParticle <init> (Lnet/minecraft/client/world/ClientWorld;DDDLnet/minecraft/item/ItemStack;)V
1010
accessible field net/minecraft/block/EntityShapeContext heldItem Lnet/minecraft/item/Item;

‎build.gradle‎

Lines changed: 12 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -71,25 +71,15 @@ allprojects {
7171
}
7272
}
7373
maven {
74-
name = "Ladysnake Libs"
75-
url = 'https://dl.bintray.com/ladysnake/libs'
74+
name = 'Ladysnake Mods'
75+
url = 'https://ladysnake.jfrog.io/artifactory/mods'
7676
content {
7777
includeGroup "io.github.onyxstudios.Cardinal-Components-API"
7878
}
7979
}
8080
maven {
81-
name = "Wrenchable"
82-
url = "https://dl.bintray.com/zundrel/wrenchable"
83-
content {
84-
includeGroup "com.zundrel"
85-
}
86-
}
87-
maven {
88-
name = "Cloth"
89-
url = "https://dl.bintray.com/shedaniel/cloth"
90-
content {
91-
includeGroup "me.shedaniel.cloth.api"
92-
}
81+
name = "shedaniel"
82+
url = "https://maven.shedaniel.me"
9383
}
9484
maven {
9585
name = "Earthcomputer"
@@ -109,6 +99,10 @@ allprojects {
10999
name = "dblsaiko"
110100
url = "https://maven.dblsaiko.net/"
111101
}
102+
maven {
103+
name = "terraformersmc"
104+
url = "https://maven.terraformersmc.com/releases/"
105+
}
112106
}
113107

114108
dependencies {
@@ -118,6 +112,7 @@ allprojects {
118112
exclude group: "net.fabricmc.fabric-api"
119113
}
120114
exclude group: "net.fabricmc"
115+
exclude group: "io.github.prospector", module: "modmenu"
121116
if (!dep.contains("me.shedaniel")) {
122117
exclude group: "me.shedaniel"
123118
}
@@ -134,6 +129,7 @@ allprojects {
134129
exclude group: "net.fabricmc.fabric-api"
135130
}
136131
exclude group: "net.fabricmc"
132+
exclude group: "io.github.prospector", module: "modmenu"
137133
if (!dep.contains("me.shedaniel")) {
138134
exclude group: "me.shedaniel"
139135
}
@@ -147,6 +143,8 @@ allprojects {
147143
modImplementation "com.google.code.findbugs:jsr305:3.0.2"
148144

149145
tap(rootProject.ext.setDefaultApis)
146+
147+
annotationProcessor "net.fabricmc:fabric-mixin-compile-extensions:0.4.6"
150148
}
151149

152150
afterEvaluate {

‎dependencies.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ project.ext.setDefaultApis = {
1919
useAsApi("vazkii.patchouli:Patchouli:${patchouli_version}")
2020

2121
// ModMenu
22-
useAsApiOptionally("io.github.prospector:modmenu:${modmenu_version}")
22+
useAsApiOptionally("com.terraformersmc:modmenu:${modmenu_version}")
2323

2424
// AutoConfig
2525
useAsApi("me.sargunvohra.mcmods:autoconfig1u:${auto_config_version}")

‎gradle.properties‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,19 +4,19 @@ ignoreRemapSrc=false
44
# Fabric
55
minecraft_version=1.16.5
66
mappings_version=1.16.5+build.1
7-
loader_version=0.11.1
7+
loader_version=0.12.12
88
# Fabric API
9-
api_version=0.29.3+1.16
9+
api_version=0.42.0+1.16
1010
# Mod
1111
mod_name=astromine
12-
mod_version=1.11.5
12+
mod_version=1.11.6
1313
mod_group=com.github.chainmailstudios.astromine
1414
version_meta=fabric-1.16.5
1515
# CurseForge
1616
tagged_versions=1.16.4,1.16.5,Fabric,Java 8
1717
release_cycle=release
1818
# Dependencies
19-
cardinal_components_version=2.7.10
19+
cardinal_components_version=2.8.3
2020
blade_version=2e84810
2121
shapes_version=1.0.0+build.4
2222
patchouli_version=1.16.4-48-FABRIC
@@ -33,7 +33,7 @@ piglib_version=1.0.2-1.16
3333
fermion_version=1.10.218
3434
# Conveniences
3535
rei_version=5.8.10
36-
modmenu_version=1.14.13+build.19
36+
modmenu_version=1.16.0
3737
databreaker_version=0.2.6
3838
tech_reborn_version=3.7.3+build.192
3939
reborn_core_version=4.6.3+build.110

0 commit comments

Comments
 (0)