Skip to content

Commit

Permalink
Initial 1.19.2 port
Browse files Browse the repository at this point in the history
  • Loading branch information
KlemenDEV committed Sep 6, 2022
1 parent 1f65f47 commit ac3037f
Show file tree
Hide file tree
Showing 16 changed files with 202 additions and 170 deletions.
6 changes: 3 additions & 3 deletions .idea/runConfigurations/runClient.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions .idea/runConfigurations/runServer.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ project.tasks.build.dependsOn project.tasks.shadowJar
java.toolchain.languageVersion = JavaLanguageVersion.of(17)

minecraft {
mappings channel: 'official', version: '1.18.2'
mappings channel: 'official', version: '1.19.2'

runs {
client {
Expand Down Expand Up @@ -59,7 +59,7 @@ configurations {
}

dependencies {
minecraft 'net.minecraftforge:forge:1.18.2-40.0.1'
minecraft 'net.minecraftforge:forge:1.19.2-43.1.1'

shadowpack 'com.fazecast:jSerialComm:2.7.0'
}
Expand Down Expand Up @@ -121,7 +121,7 @@ task copyModIntoFinalBuild(type: Copy) {
from('build/libs/')
include ('mcreator_link-' + version + '-all.jar')
into('build/export/')
rename { "MCreator Link " + project.version + " [1.18.2].jar" }
rename { "MCreator Link " + project.version + " [1.19.2].jar" }
}

task copyDevModIntoFinalBuild(type: Copy) {
Expand All @@ -130,7 +130,7 @@ task copyDevModIntoFinalBuild(type: Copy) {
from('build/libs/')
include ('mcreator_link-' + version + '.jar')
into('build/export/')
rename { "MCreator Link " + project.version + " [1.18.2] - Dev.jar" }
rename { "MCreator Link " + project.version + " [1.19.2] - Dev.jar" }
}

task exportArduinoLibrary(type: Zip) {
Expand Down
26 changes: 20 additions & 6 deletions src/main/java/net/mcreator/minecraft/link/MCreatorLink.java
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,19 @@
package net.mcreator.minecraft.link;

import net.mcreator.minecraft.link.command.CommandLink;
import net.mcreator.minecraft.link.command.LinkDeviceArgumentType;
import net.mcreator.minecraft.link.devices.arduino.ArduinoDetector;
import net.mcreator.minecraft.link.devices.raspberrypi.RaspberryPiDetector;
import net.mcreator.minecraft.link.init.MCreatorLinkArgumentTypes;
import net.mcreator.minecraft.link.init.MCreatorLinkBlocks;
import net.mcreator.minecraft.link.init.MCreatorLinkItems;
import net.minecraft.commands.synchronization.ArgumentTypeInfos;
import net.minecraftforge.event.RegisterCommandsEvent;
import net.minecraftforge.eventbus.api.IEventBus;
import net.minecraftforge.eventbus.api.SubscribeEvent;
import net.minecraftforge.fml.ModList;
import net.minecraftforge.fml.common.Mod;
import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext;
import org.apache.maven.artifact.versioning.ArtifactVersion;

/**
Expand All @@ -35,14 +42,21 @@
public static ArtifactVersion VERSION;

public MCreatorLink() {
LINK.registerDeviceDetector(new ArduinoDetector());
LINK.registerDeviceDetector(new RaspberryPiDetector());
LINK.registerDeviceDetector(new ArduinoDetector());
LINK.registerDeviceDetector(new RaspberryPiDetector());

VERSION = ModList.get().getModFileById("mcreator_link").getMods().get(0).getVersion();
}
VERSION = ModList.get().getModFileById("mcreator_link").getMods().get(0).getVersion();

IEventBus bus = FMLJavaModLoadingContext.get().getModEventBus();
MCreatorLinkBlocks.REGISTRY.register(bus);
MCreatorLinkItems.REGISTRY.register(bus);
MCreatorLinkArgumentTypes.REGISTRY.register(bus);
}

@SubscribeEvent public static void serverLoad(RegisterCommandsEvent event) {
event.getDispatcher().register(CommandLink.build());
}
ArgumentTypeInfos.registerByClass(LinkDeviceArgumentType.class, MCreatorLinkArgumentTypes.LINK_DEVICE_ARGUMENT_INFO.get());

event.getDispatcher().register(CommandLink.build());
}

}
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ public class LinkBlock extends Block {

public LinkBlock() {
super(BlockBehaviour.Properties.of(Material.METAL));
setRegistryName("link");
}

@SuppressWarnings("deprecation") @Override
Expand Down
Loading

0 comments on commit ac3037f

Please sign in to comment.