Skip to content

Commit 0b0e056

Browse files
committed
Mostly port to 1.19.2. Model stuff still missing.
1 parent a14f0d7 commit 0b0e056

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+879
-954
lines changed

.gitattributes

+2
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,5 @@
33
# are changed when only line endings change.
44
src/generated/**/.cache/cache text eol=lf
55
src/generated/**/*.json text eol=lf
6+
7+
src/generated/** linguist-generated=true

build.gradle

+14-22
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,19 @@
1-
buildscript {
2-
repositories {
3-
maven { url = 'https://maven.minecraftforge.net' }
4-
maven { url = 'https://maven.parchmentmc.org' }
5-
mavenCentral()
6-
}
7-
dependencies {
8-
classpath group: 'net.minecraftforge.gradle', name: 'ForgeGradle', version: '5.1.+', changing: true
9-
classpath 'org.parchmentmc:librarian:1.+'
10-
}
1+
plugins {
2+
id 'eclipse'
3+
id 'maven-publish'
4+
id 'net.minecraftforge.gradle' version '5.1.+'
5+
id 'org.parchmentmc.librarian.forgegradle' version '1.+'
116
}
12-
apply plugin: 'net.minecraftforge.gradle'
13-
apply plugin: 'org.parchmentmc.librarian.forgegradle'
14-
15-
apply plugin: 'eclipse'
16-
apply plugin: 'maven-publish'
177

188
version = "${minecraft_version}-${mod_version}"
199
group = 'platinpython.rgbblocks'
2010
archivesBaseName = 'RGB Blocks'
2111

2212
java.toolchain.languageVersion = JavaLanguageVersion.of(17)
2313

24-
println('Java: ' + System.getProperty('java.version') + ' JVM: ' + System.getProperty('java.vm.version') + '(' + System.getProperty('java.vendor') + ') Arch: ' + System.getProperty('os.arch'))
14+
println "Java: ${System.getProperty 'java.version'}, JVM: ${System.getProperty 'java.vm.version'} (${System.getProperty 'java.vendor'}), Arch: ${System.getProperty 'os.arch'}"
2515
minecraft {
26-
mappings channel: 'parchment', version: '2022.05.22-1.18.2'
16+
mappings channel: 'parchment', version: '2022.11.06-1.19.2'
2717

2818
accessTransformer = file('src/main/resources/META-INF/accesstransformer.cfg')
2919

@@ -86,11 +76,9 @@ repositories {
8676
}
8777

8878
dependencies {
89-
minecraft 'net.minecraftforge:forge:1.18.2-40.1.51'
79+
minecraft 'net.minecraftforge:forge:1.19.2-43.1.47'
9080

91-
// compileOnly fg.deobf("curse.maven:top-245211:3671753:api")
92-
// runtimeOnly fg.deobf("curse.maven:top-245211:3671753")
93-
implementation fg.deobf("curse.maven:top-245211:3671753")
81+
implementation fg.deobf("curse.maven:top-245211:3965693")
9482
}
9583

9684
jar {
@@ -100,11 +88,15 @@ jar {
10088
"Specification-Vendor" : "PlatinPython",
10189
"Specification-Version" : "1",
10290
"Implementation-Title" : project.name,
103-
"Implementation-Version" : "${version}",
91+
"Implementation-Version" : project.jar.archiveVersion,
10492
"Implementation-Vendor" : "PlatinPython",
10593
"Implementation-Timestamp": new Date().format("yyyy-MM-dd'T'HH:mm:ssZ")
10694
])
10795
}
10896
}
10997

11098
jar.finalizedBy('reobfJar')
99+
100+
tasks.withType(JavaCompile).configureEach {
101+
options.encoding = 'UTF-8'
102+
}

gradle.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,5 @@ org.gradle.jvmargs=-Xmx3G
44
org.gradle.daemon=false
55

66
#version info
7-
minecraft_version=1.18.2
7+
minecraft_version=1.19.2
88
mod_version=1.1.6.1

settings.gradle

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
pluginManagement {
2+
repositories {
3+
gradlePluginPortal()
4+
maven { url = 'https://maven.minecraftforge.net' }
5+
maven { url = 'https://maven.parchmentmc.org' }
6+
}
7+
}

src/main/java/platinpython/rgbblocks/RGBBlocks.java

+17-14
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,22 @@
11
package platinpython.rgbblocks;
22

33
import net.minecraft.core.NonNullList;
4-
import org.apache.logging.log4j.LogManager;
5-
import org.apache.logging.log4j.Logger;
6-
74
import net.minecraft.world.item.CreativeModeTab;
85
import net.minecraft.world.item.Item;
96
import net.minecraft.world.item.ItemStack;
107
import net.minecraft.world.level.block.DispenserBlock;
118
import net.minecraftforge.common.MinecraftForge;
12-
import net.minecraftforge.event.RegistryEvent.MissingMappings;
13-
import net.minecraftforge.event.RegistryEvent.MissingMappings.Mapping;
149
import net.minecraftforge.eventbus.api.SubscribeEvent;
1510
import net.minecraftforge.fml.InterModComms;
1611
import net.minecraftforge.fml.ModList;
1712
import net.minecraftforge.fml.common.Mod;
1813
import net.minecraftforge.fml.event.lifecycle.FMLCommonSetupEvent;
1914
import net.minecraftforge.fml.event.lifecycle.InterModEnqueueEvent;
2015
import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext;
16+
import net.minecraftforge.registries.ForgeRegistries;
17+
import net.minecraftforge.registries.MissingMappingsEvent;
18+
import org.apache.logging.log4j.LogManager;
19+
import org.apache.logging.log4j.Logger;
2120
import platinpython.rgbblocks.data.DataGatherer;
2221
import platinpython.rgbblocks.dispenser.DispensePaintbucketBehaviour;
2322
import platinpython.rgbblocks.util.RegistryHandler;
@@ -45,7 +44,8 @@ public void setup(final FMLCommonSetupEvent event) {
4544
PacketHandler.register();
4645

4746
event.enqueueWork(() -> DispenserBlock.registerBehavior(ItemRegistry.PAINT_BUCKET.get(),
48-
new DispensePaintbucketBehaviour()));
47+
new DispensePaintbucketBehaviour()
48+
));
4949
}
5050

5151
public void enqueueIMC(final InterModEnqueueEvent event) {
@@ -55,9 +55,10 @@ public void enqueueIMC(final InterModEnqueueEvent event) {
5555
}
5656

5757
@SubscribeEvent
58-
public void replaceMappings(MissingMappings<Item> event) {
59-
for (Mapping<Item> mapping : event.getAllMappings()) {
60-
if (mapping.key.toString().equals("rgbblocks:bucket_of_paint")) {
58+
public void replaceMappings(MissingMappingsEvent event) {
59+
for (MissingMappingsEvent.Mapping<Item> mapping : event.getAllMappings(
60+
ForgeRegistries.ITEMS.getRegistryKey())) {
61+
if (mapping.getKey().toString().equals("rgbblocks:bucket_of_paint")) {
6162
mapping.remap(ItemRegistry.PAINT_BUCKET.get());
6263
}
6364
}
@@ -72,11 +73,13 @@ public ItemStack makeIcon() {
7273
}
7374

7475
@Override
75-
public void fillItemList(NonNullList<ItemStack> pItems) {
76-
super.fillItemList(pItems);
77-
pItems.sort((i1, i2) -> i1.getItem().getRegistryName().compareNamespaced(i2.getItem().getRegistryName()));
78-
pItems.removeIf(i -> i.getItem().equals(ItemRegistry.PAINT_BUCKET.get()));
79-
pItems.add(0, ItemRegistry.PAINT_BUCKET.get().getDefaultInstance());
76+
public void fillItemList(NonNullList<ItemStack> items) {
77+
super.fillItemList(items);
78+
//noinspection ConstantConditions
79+
items.sort((i1, i2) -> ForgeRegistries.ITEMS.getKey(i1.getItem())
80+
.compareNamespaced(ForgeRegistries.ITEMS.getKey(i2.getItem())));
81+
items.removeIf(i -> i.getItem().equals(ItemRegistry.PAINT_BUCKET.get()));
82+
items.add(0, ItemRegistry.PAINT_BUCKET.get().getDefaultInstance());
8083
}
8184
};
8285
}

src/main/java/platinpython/rgbblocks/block/RGBBlock.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,8 @@ public void setPlacedBy(Level worldIn, BlockPos pos, BlockState state, LivingEnt
2828
}
2929

3030
@Override
31-
public ItemStack getCloneItemStack(BlockState state, HitResult target, BlockGetter world, BlockPos pos, Player player) {
31+
public ItemStack getCloneItemStack(BlockState state, HitResult target, BlockGetter world, BlockPos pos,
32+
Player player) {
3233
return RGBBlockUtils.getCloneItemStack(state, target, world, pos, player);
3334
}
3435
}

0 commit comments

Comments
 (0)