ijustwanttohaveaplacetokeepminecraftmods/More-Red-CCT-Compat
ijustwanttohaveaplacetokeepminecraftmods/More-Red-CCT-Compat
2
0
Fork 0
Code Issues Pull Requests Releases Activity

1.21.1, neoforge, pain.

Browse Source
This commit is contained in:
YuRaNnNzZZ 2024-09-02 09:17:53 +03:00
parent d6cf150277
commit eb394da12f
Signed by: YuRaNnNzZZ
GPG Key ID: 5F71738C85A6006D
13 changed files with 146 additions and 199 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
.gitignore vendored
View File

@ -20,6 +20,7 @@ build
# other # other
eclipse eclipse
run run
runs
run-data
# Files from Forge MDK repo
forge*changelog.txt

103
build.gradle
View File

@ -1,45 +1,50 @@
plugins { plugins {
id 'java-library'
id 'eclipse' id 'eclipse'
id 'idea' id 'idea'
id 'maven-publish' id 'maven-publish'
id 'net.minecraftforge.gradle' version '[6.0,6.2)' id 'net.neoforged.gradle.userdev' version '7.0.145'
}
tasks.named('wrapper', Wrapper).configure {
distributionType = Wrapper.DistributionType.BIN
} }
version = "${minecraft_version}-${mod_version}" version = "${minecraft_version}-${mod_version}"
group = mod_group_id group = mod_group_id
repositories {
mavenLocal()
}
base { base {
archivesName = archive_base_name archivesName = archive_base_name
} }
java.toolchain.languageVersion = JavaLanguageVersion.of(17) java.toolchain.languageVersion = JavaLanguageVersion.of(21)
minecraft {
mappings channel: mapping_channel, version: mapping_version
copyIdeResources = true
runs { runs {
configureEach { configureEach {
workingDirectory project.file('run') systemProperty 'forge.logging.markers', 'REGISTRIES'
property 'forge.logging.console.level', 'debug' systemProperty 'forge.logging.console.level', 'debug'
mods { modSource project.sourceSets.main
"${mod_id}" {
source sourceSets.main
}
}
} }
client { client {
property 'forge.enabledGameTestNamespaces', mod_id systemProperty 'forge.enabledGameTestNamespaces', project.mod_id
} }
server { server {
property 'forge.enabledGameTestNamespaces', mod_id systemProperty 'forge.enabledGameTestNamespaces', project.mod_id
args '--nogui' programArgument '--nogui'
} }
} }
sourceSets.main.resources { srcDir 'src/generated/resources' }
configurations {
runtimeClasspath.extendsFrom localRuntime
} }
repositories { repositories {
@ -51,27 +56,34 @@ repositories {
} }
} }
maven { maven {
url 'https://cubicinterpolation.net/maven/' url 'https://commoble.net/maven/'
content { content {
includeGroup 'commoble.morered' includeGroup 'net.commoble.morered'
}
}
maven {
url 'https://cursemaven.com'
content {
includeGroup 'curse.maven'
} }
} }
} }
dependencies { dependencies {
minecraft "net.minecraftforge:forge:${minecraft_version}-${forge_version}" implementation "net.neoforged:neoforge:${neo_version}"
compileOnly("cc.tweaked:cc-tweaked-${minecraft_version}-core-api:${cctweaked_version}") compileOnly "cc.tweaked:cc-tweaked-${minecraft_version_major}-core-api:${cctweaked_version}"
compileOnly(fg.deobf("cc.tweaked:cc-tweaked-${minecraft_version}-forge-api:${cctweaked_version}")) compileOnly "cc.tweaked:cc-tweaked-${minecraft_version_major}-forge-api:${cctweaked_version}"
implementation(fg.deobf("cc.tweaked:cc-tweaked-${minecraft_version}-forge:${cctweaked_version}")) compileOnly "cc.tweaked:cc-tweaked-${minecraft_version_major}-forge:${cctweaked_version}"
runtimeOnly "curse.maven:cc-tweaked-282001:${cctweaked_file_id}" // 1.113.0 is NOT on maven, why??????????????????????
implementation fg.deobf("commoble.morered:morered-${minecraft_version}:${morered_version}") implementation "net.commoble.morered:morered-${minecraft_version_major}:${morered_version}"
} }
tasks.named('processResources', ProcessResources).configure { tasks.withType(ProcessResources).configureEach {
var replaceProperties = [ var replaceProperties = [
minecraft_version: minecraft_version, minecraft_version_range: minecraft_version_range, minecraft_version: minecraft_version, minecraft_version_range: minecraft_version_range,
forge_version: forge_version, forge_version_range: forge_version_range, neo_version: neo_version, neo_version_range: neo_version_range,
loader_version_range: loader_version_range, loader_version_range: loader_version_range,
mod_id: mod_id, mod_name: mod_name, mod_license: mod_license, mod_version: mod_version, mod_id: mod_id, mod_name: mod_name, mod_license: mod_license, mod_version: mod_version,
mod_authors: mod_authors, mod_description: mod_description, mod_authors: mod_authors, mod_description: mod_description,
@ -80,44 +92,20 @@ tasks.named('processResources', ProcessResources).configure {
] ]
inputs.properties replaceProperties inputs.properties replaceProperties
filesMatching(['META-INF/mods.toml', 'pack.mcmeta']) { filesMatching(['META-INF/neoforge.mods.toml']) {
expand replaceProperties + [project: project] expand replaceProperties
} }
} }
// Example for how to get properties into the manifest for reading at runtime.
tasks.named('jar', Jar).configure {
manifest {
attributes([
'Specification-Title' : mod_id,
'Specification-Vendor' : mod_authors,
'Specification-Version' : '1', // We are version 1 of ourselves
'Implementation-Title' : project.name,
'Implementation-Version' : project.jar.archiveVersion,
'Implementation-Vendor' : mod_authors,
'Implementation-Timestamp': new Date().format("yyyy-MM-dd'T'HH:mm:ssZ")
])
}
// This is the preferred method to reobfuscate your jar file
finalizedBy 'reobfJar'
}
// However if you are in a multi-project build, dev time needs unobfed jar files, so you can delay the obfuscation until publishing by doing:
// tasks.named('publish').configure {
// dependsOn 'reobfJar'
// }
// Example configuration to allow publishing using the maven-publish plugin
publishing { publishing {
publications { publications {
register('mavenJava', MavenPublication) { register('mavenJava', MavenPublication) {
artifact jar from components.java
} }
} }
repositories { repositories {
maven { maven {
url "file://${project.projectDir}/mcmodsrepo" url "file://${project.projectDir}/repo"
} }
} }
} }
@ -125,3 +113,10 @@ publishing {
tasks.withType(JavaCompile).configureEach { tasks.withType(JavaCompile).configureEach {
options.encoding = 'UTF-8' // Use the UTF-8 charset for Java compilation options.encoding = 'UTF-8' // Use the UTF-8 charset for Java compilation
} }
idea {
module {
downloadSources = true
downloadJavadoc = true
}
}

62
gradle.properties
View File

@ -1,42 +1,27 @@
# Sets default memory used for gradle commands. Can be overridden by user or command line properties. # Sets default memory used for gradle commands. Can be overridden by user or command line properties.
# This is required to provide enough memory for the Minecraft decompilation process. org.gradle.jvmargs=-Xmx1G
org.gradle.jvmargs=-Xmx3G
org.gradle.daemon=false org.gradle.daemon=false
org.gradle.debug=false
#read more on this at https://github.com/neoforged/NeoGradle/blob/NG_7.0/README.md#apply-parchment-mappings
## Environment Properties # you can also find the latest versions at: https://parchmentmc.org/docs/getting-started
neogradle.subsystems.parchment.minecraftVersion=1.21
# The Minecraft version must agree with the Forge version to get a valid artifact neogradle.subsystems.parchment.mappingsVersion=2024.07.28
minecraft_version=1.20.1 # Environment Properties
# You can find the latest versions here: https://projects.neoforged.net/neoforged/neoforge
# The Minecraft version must agree with the Neo version to get a valid artifact
minecraft_version=1.21.1
minecraft_version_major=1.21
# The Minecraft version range can use any release version of Minecraft as bounds. # The Minecraft version range can use any release version of Minecraft as bounds.
# Snapshots, pre-releases, and release candidates are not guaranteed to sort properly # Snapshots, pre-releases, and release candidates are not guaranteed to sort properly
# as they do not follow standard versioning conventions. # as they do not follow standard versioning conventions.
minecraft_version_range=[1.20.1,1.21) minecraft_version_range=[1.21.1,1.22)
# The Forge version must agree with the Minecraft version to get a valid artifact # The Neo version must agree with the Minecraft version to get a valid artifact
forge_version=47.1.0 neo_version=21.1.9
# The Forge version range can use any version of Forge as bounds or match the loader version range # The Neo version range can use any version of Neo as bounds
forge_version_range=[47.1.0,) neo_version_range=[21.1.9,)
# The loader version range can only use the major version of Forge/FML as bounds # The loader version range can only use the major version of FML as bounds
loader_version_range=[47,) loader_version_range=[4,)
# The mapping channel to use for mappings.
# The default set of supported mapping channels are ["official", "snapshot", "snapshot_nodoc", "stable", "stable_nodoc"].
# Additional mapping channels can be registered through the "channelProviders" extension in a Gradle plugin.
#
# | Channel | Version | |
# |-----------|----------------------|--------------------------------------------------------------------------------|
# | official | MCVersion | Official field/method names from Mojang mapping files |
# | parchment | YYYY.MM.DD-MCVersion | Open community-sourced parameter names and javadocs layered on top of official |
#
# You must be aware of the Mojang license when using the 'official' or 'parchment' mappings.
# See more information here: https://github.com/MinecraftForge/MCPConfig/blob/master/Mojang.md
#
# Parchment is an unofficial project maintained by ParchmentMC, separate from Minecraft Forge.
# Additional setup is needed to use their mappings, see https://parchmentmc.org/docs/getting-started
mapping_channel=official
# The mapping version to query from the mapping channel.
# This must match the format required by the mapping channel.
mapping_version=1.20.1
## Mod Properties ## Mod Properties
@ -48,7 +33,7 @@ mod_name=More Red x CC:Tweaked Compat
# The license of the mod. Review your options at https://choosealicense.com/. All Rights Reserved is the default. # The license of the mod. Review your options at https://choosealicense.com/. All Rights Reserved is the default.
mod_license=MIT mod_license=MIT
# The mod version. See https://semver.org/ # The mod version. See https://semver.org/
mod_version=1.0.0 mod_version=1.1.0
# The group ID for the mod. It is only important when publishing as an artifact to a Maven repository. # The group ID for the mod. It is only important when publishing as an artifact to a Maven repository.
# This should match the base package used for the mod sources. # This should match the base package used for the mod sources.
# See https://maven.apache.org/guides/mini/guide-naming-conventions.html # See https://maven.apache.org/guides/mini/guide-naming-conventions.html
@ -68,8 +53,9 @@ archive_base_name=MoreRed-CCT-Compat
## Mod Dependencies Properties ## Mod Dependencies Properties
# CC:Tweaked version # CC:Tweaked version
cctweaked_version=1.106.1 cctweaked_version=1.111.0
cctweaked_version_range=[1.106.1,) cctweaked_version_range=[1.111.0,)
cctweaked_file_id=5644993
# More Red version # More Red version
morered_version=4.0.0.0 morered_version=6.0.0.2
morered_version_range=[4.0.0.0,) morered_version_range=[6.0.0.2,)

BIN
gradle/wrapper/gradle-wrapper.jar vendored
View File

Binary file not shown.

3
gradle/wrapper/gradle-wrapper.properties vendored
View File

@ -1,6 +1,7 @@
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
networkTimeout=10000 networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists

34
gradlew vendored
View File

@ -15,6 +15,8 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
# #
# SPDX-License-Identifier: Apache-2.0
#
############################################################################## ##############################################################################
# #
@ -55,7 +57,7 @@
# Darwin, MinGW, and NonStop. # Darwin, MinGW, and NonStop.
# #
# (3) This script is generated from the Groovy template # (3) This script is generated from the Groovy template
# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt # https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
# within the Gradle project. # within the Gradle project.
# #
# You can find Gradle at https://github.com/gradle/gradle/. # You can find Gradle at https://github.com/gradle/gradle/.
@ -83,10 +85,9 @@ done
# This is normally unused # This is normally unused
# shellcheck disable=SC2034 # shellcheck disable=SC2034
APP_BASE_NAME=${0##*/} APP_BASE_NAME=${0##*/}
APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. ' "$PWD" ) || exit
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
# Use the maximum available, or set MAX_FD != -1 to use that value. # Use the maximum available, or set MAX_FD != -1 to use that value.
MAX_FD=maximum MAX_FD=maximum
@ -133,18 +134,21 @@ location of your Java installation."
fi fi
else else
JAVACMD=java JAVACMD=java
which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. if ! command -v java >/dev/null 2>&1
then
die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
Please set the JAVA_HOME variable in your environment to match the Please set the JAVA_HOME variable in your environment to match the
location of your Java installation." location of your Java installation."
fi fi
fi
# Increase the maximum file descriptors if we can. # Increase the maximum file descriptors if we can.
if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
case $MAX_FD in #( case $MAX_FD in #(
max*) max*)
# In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
# shellcheck disable=SC3045 # shellcheck disable=SC2039,SC3045
MAX_FD=$( ulimit -H -n ) || MAX_FD=$( ulimit -H -n ) ||
warn "Could not query maximum file descriptor limit" warn "Could not query maximum file descriptor limit"
esac esac
@ -152,7 +156,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
'' | soft) :;; #( '' | soft) :;; #(
*) *)
# In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
# shellcheck disable=SC3045 # shellcheck disable=SC2039,SC3045
ulimit -n "$MAX_FD" || ulimit -n "$MAX_FD" ||
warn "Could not set maximum file descriptor limit to $MAX_FD" warn "Could not set maximum file descriptor limit to $MAX_FD"
esac esac
@ -197,11 +201,15 @@ if "$cygwin" || "$msys" ; then
done done
fi fi
# Collect all arguments for the java command;
# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
# shell script including quotes and variable substitutions, so put them in DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
# double quotes to make sure that they get re-expanded; and
# * put everything else in single quotes, so that it's not re-expanded. # Collect all arguments for the java command:
# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
# and any embedded shellness will be escaped.
# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
# treated as '${Hostname}' itself on the command line.
set -- \ set -- \
"-Dorg.gradle.appname=$APP_BASE_NAME" \ "-Dorg.gradle.appname=$APP_BASE_NAME" \

22
gradlew.bat vendored
View File

@ -13,6 +13,8 @@
@rem See the License for the specific language governing permissions and @rem See the License for the specific language governing permissions and
@rem limitations under the License. @rem limitations under the License.
@rem @rem
@rem SPDX-License-Identifier: Apache-2.0
@rem
@if "%DEBUG%"=="" @echo off @if "%DEBUG%"=="" @echo off
@rem ########################################################################## @rem ##########################################################################
@ -43,11 +45,11 @@ set JAVA_EXE=java.exe
%JAVA_EXE% -version >NUL 2>&1 %JAVA_EXE% -version >NUL 2>&1
if %ERRORLEVEL% equ 0 goto execute if %ERRORLEVEL% equ 0 goto execute
echo. echo. 1>&2
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
echo. echo. 1>&2
echo Please set the JAVA_HOME variable in your environment to match the echo Please set the JAVA_HOME variable in your environment to match the 1>&2
echo location of your Java installation. echo location of your Java installation. 1>&2
goto fail goto fail
@ -57,11 +59,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe
if exist "%JAVA_EXE%" goto execute if exist "%JAVA_EXE%" goto execute
echo. echo. 1>&2
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
echo. echo. 1>&2
echo Please set the JAVA_HOME variable in your environment to match the echo Please set the JAVA_HOME variable in your environment to match the 1>&2
echo location of your Java installation. echo location of your Java installation. 1>&2
goto fail goto fail

8
settings.gradle
View File

@ -1,13 +1,11 @@
pluginManagement { pluginManagement {
repositories { repositories {
mavenLocal()
gradlePluginPortal() gradlePluginPortal()
maven { maven { url = 'https://maven.neoforged.net/releases' }
name = 'MinecraftForge'
url = 'https://maven.minecraftforge.net/'
}
} }
} }
plugins { plugins {
id 'org.gradle.toolchains.foojay-resolver-convention' version '0.5.0' id 'org.gradle.toolchains.foojay-resolver-convention' version '0.8.0'
} }

30
src/main/java/ru/yurannnzzz/moreredcccompat/MoreRedCCCompatMod.java
View File

@ -4,15 +4,11 @@ import commoble.morered.api.MoreRedAPI;
import commoble.morered.api.WireConnector; import commoble.morered.api.WireConnector;
import dan200.computercraft.api.ComputerCraftAPI; import dan200.computercraft.api.ComputerCraftAPI;
import dan200.computercraft.shared.ModRegistry; import dan200.computercraft.shared.ModRegistry;
import dan200.computercraft.shared.computer.blocks.AbstractComputerBlockEntity;
import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.Block;
import net.minecraft.world.level.block.entity.BlockEntity; import net.neoforged.bus.api.IEventBus;
import net.minecraftforge.common.MinecraftForge; import net.neoforged.fml.common.Mod;
import net.minecraftforge.event.AttachCapabilitiesEvent; import net.neoforged.fml.event.lifecycle.FMLCommonSetupEvent;
import net.minecraftforge.eventbus.api.SubscribeEvent; import net.neoforged.neoforge.capabilities.RegisterCapabilitiesEvent;
import net.minecraftforge.fml.common.Mod;
import net.minecraftforge.fml.event.lifecycle.FMLCommonSetupEvent;
import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext;
import ru.yurannnzzz.moreredcccompat.cc.MoreRedBundledRedstoneProvider; import ru.yurannnzzz.moreredcccompat.cc.MoreRedBundledRedstoneProvider;
import ru.yurannnzzz.moreredcccompat.morered.ComputerChanneledPowerCapability; import ru.yurannnzzz.moreredcccompat.morered.ComputerChanneledPowerCapability;
import ru.yurannnzzz.moreredcccompat.morered.ComputerWireConnector; import ru.yurannnzzz.moreredcccompat.morered.ComputerWireConnector;
@ -23,10 +19,9 @@ import java.util.Map;
public class MoreRedCCCompatMod { public class MoreRedCCCompatMod {
public static final String MOD_ID = "moreredxcctcompat"; public static final String MOD_ID = "moreredxcctcompat";
public MoreRedCCCompatMod() { public MoreRedCCCompatMod(IEventBus modEventBus) {
FMLJavaModLoadingContext.get().getModEventBus().addListener(this::registerConnectors); modEventBus.addListener(this::registerConnectors);
modEventBus.addListener(this::registerCapabilities);
MinecraftForge.EVENT_BUS.register(this);
ComputerCraftAPI.registerBundledRedstoneProvider(new MoreRedBundledRedstoneProvider()); ComputerCraftAPI.registerBundledRedstoneProvider(new MoreRedBundledRedstoneProvider());
} }
@ -42,10 +37,11 @@ public class MoreRedCCCompatMod {
registry.put(ModRegistry.Blocks.TURTLE_ADVANCED.get(), connector); registry.put(ModRegistry.Blocks.TURTLE_ADVANCED.get(), connector);
} }
@SubscribeEvent private void registerCapabilities(RegisterCapabilitiesEvent event) {
public void attachCapability(AttachCapabilitiesEvent<BlockEntity> event) { event.registerBlockEntity(MoreRedAPI.CHANNELED_POWER_CAPABILITY, ModRegistry.BlockEntities.COMPUTER_NORMAL.get(), (be, side) -> new ComputerChanneledPowerCapability(side));
if (event.getObject() instanceof AbstractComputerBlockEntity) { event.registerBlockEntity(MoreRedAPI.CHANNELED_POWER_CAPABILITY, ModRegistry.BlockEntities.COMPUTER_ADVANCED.get(), (be, side) -> new ComputerChanneledPowerCapability(side));
event.addCapability(ComputerChanneledPowerCapability.LOCATION, new ComputerChanneledPowerCapability.Provider()); event.registerBlockEntity(MoreRedAPI.CHANNELED_POWER_CAPABILITY, ModRegistry.BlockEntities.COMPUTER_COMMAND.get(), (be, side) -> new ComputerChanneledPowerCapability(side));
} event.registerBlockEntity(MoreRedAPI.CHANNELED_POWER_CAPABILITY, ModRegistry.BlockEntities.TURTLE_NORMAL.get(), (be, side) -> new ComputerChanneledPowerCapability(side));
event.registerBlockEntity(MoreRedAPI.CHANNELED_POWER_CAPABILITY, ModRegistry.BlockEntities.TURTLE_ADVANCED.get(), (be, side) -> new ComputerChanneledPowerCapability(side));
} }
} }

7
src/main/java/ru/yurannnzzz/moreredcccompat/cc/MoreRedBundledRedstoneProvider.java
View File

@ -7,7 +7,6 @@ import net.minecraft.core.BlockPos;
import net.minecraft.core.Direction; import net.minecraft.core.Direction;
import net.minecraft.world.level.Level; import net.minecraft.world.level.Level;
import net.minecraft.world.level.block.entity.BlockEntity; import net.minecraft.world.level.block.entity.BlockEntity;
import net.minecraftforge.common.util.LazyOptional;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
public class MoreRedBundledRedstoneProvider implements BundledRedstoneProvider { public class MoreRedBundledRedstoneProvider implements BundledRedstoneProvider {
@ -16,11 +15,9 @@ public class MoreRedBundledRedstoneProvider implements BundledRedstoneProvider {
BlockEntity blockEntity = world.getBlockEntity(pos); BlockEntity blockEntity = world.getBlockEntity(pos);
if (blockEntity != null) { if (blockEntity != null) {
LazyOptional<ChanneledPowerSupplier> capability = blockEntity.getCapability(MoreRedAPI.CHANNELED_POWER_CAPABILITY, side); ChanneledPowerSupplier channeledPowerSupplier = world.getCapability(MoreRedAPI.CHANNELED_POWER_CAPABILITY, blockEntity.getBlockPos(), side);
if (capability.isPresent()) {
ChanneledPowerSupplier channeledPowerSupplier = capability.orElseThrow(NullPointerException::new);
if (channeledPowerSupplier != null) {
int result = 0; int result = 0;
for (int i = 0; i < 16; i++) { for (int i = 0; i < 16; i++) {

29
src/main/java/ru/yurannnzzz/moreredcccompat/morered/ComputerChanneledPowerCapability.java
View File

@ -1,27 +1,15 @@
package ru.yurannnzzz.moreredcccompat.morered; package ru.yurannnzzz.moreredcccompat.morered;
import commoble.morered.api.ChanneledPowerSupplier; import commoble.morered.api.ChanneledPowerSupplier;
import commoble.morered.api.MoreRedAPI;
import dan200.computercraft.api.ComputerCraftAPI; import dan200.computercraft.api.ComputerCraftAPI;
import net.minecraft.Util;
import net.minecraft.core.BlockPos; import net.minecraft.core.BlockPos;
import net.minecraft.core.Direction; import net.minecraft.core.Direction;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.world.level.Level; import net.minecraft.world.level.Level;
import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.level.block.state.BlockState;
import net.minecraftforge.common.capabilities.Capability;
import net.minecraftforge.common.capabilities.ICapabilityProvider;
import net.minecraftforge.common.util.LazyOptional;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.Nullable;
import ru.yurannnzzz.moreredcccompat.MoreRedCCCompatMod;
import java.util.EnumMap;
import java.util.Map;
public class ComputerChanneledPowerCapability implements ChanneledPowerSupplier { public class ComputerChanneledPowerCapability implements ChanneledPowerSupplier {
public static final ResourceLocation LOCATION = new ResourceLocation(MoreRedCCCompatMod.MOD_ID, "bundled_redstone");
private final Direction side; private final Direction side;
public ComputerChanneledPowerCapability(Direction side) { public ComputerChanneledPowerCapability(Direction side) {
@ -40,21 +28,4 @@ public class ComputerChanneledPowerCapability implements ChanneledPowerSupplier
int expected = 1 << channel; int expected = 1 << channel;
return ((output & expected) == expected) ? 31 : 0; return ((output & expected) == expected) ? 31 : 0;
} }
public static class Provider implements ICapabilityProvider {
private final Map<Direction, LazyOptional<ChanneledPowerSupplier>> sidedPowerSuppliers = Util.make(new EnumMap<>(Direction.class), map -> {
for (Direction side : Direction.values()) {
map.put(side, LazyOptional.of(() -> new ComputerChanneledPowerCapability(side)));
}
});
@Override
public @NotNull <T> LazyOptional<T> getCapability(@NotNull Capability<T> cap, @Nullable Direction side) {
if (cap == MoreRedAPI.CHANNELED_POWER_CAPABILITY && side != null) {
return sidedPowerSuppliers.get(side).cast();
}
return LazyOptional.empty();
}
}
} }

12
src/main/resources/META-INF/mods.toml → src/main/resources/META-INF/neoforge.mods.toml
View File

@ -12,29 +12,29 @@ authors="${mod_authors}"
description='''${mod_description}''' description='''${mod_description}'''
[[dependencies.${mod_id}]] [[dependencies.${mod_id}]]
modId="forge" modId="neoforge"
mandatory=true type="required"
versionRange="${forge_version_range}" versionRange="${neo_version_range}"
ordering="NONE" ordering="NONE"
side="BOTH" side="BOTH"
[[dependencies.${mod_id}]] [[dependencies.${mod_id}]]
modId="minecraft" modId="minecraft"
mandatory=true type="required"
versionRange="${minecraft_version_range}" versionRange="${minecraft_version_range}"
ordering="NONE" ordering="NONE"
side="BOTH" side="BOTH"
[[dependencies.${mod_id}]] [[dependencies.${mod_id}]]
modId="computercraft" modId="computercraft"
mandatory=true type="required"
versionRange="${cctweaked_version_range}" versionRange="${cctweaked_version_range}"
ordering="NONE" ordering="NONE"
side="BOTH" side="BOTH"
[[dependencies.${mod_id}]] [[dependencies.${mod_id}]]
modId="morered" modId="morered"
mandatory=true type="required"
versionRange="${morered_version_range}" versionRange="${morered_version_range}"
ordering="NONE" ordering="NONE"
side="BOTH" side="BOTH"

8
src/main/resources/pack.mcmeta
View File

@ -1,8 +0,0 @@
{
"pack": {
"description": {
"text": "${mod_id} resources"
},
"pack_format": 15
}
}