mirror of
https://github.com/GTNewHorizons/ForgeMultipart.git
synced 2026-11-18 03:25:35 +00:00
update bs+sa+gradle+deps
This commit is contained in:
7 files changed
+32
-44
No files matched your search
+9
-22
@@ -1,4 +1,4 @@
|
||||
//version: 1699290261
|
||||
//version: 1702141377
|
||||
/*
|
||||
DO NOT CHANGE THIS FILE!
|
||||
Also, you may replace this file at any time if there is an update available.
|
||||
@@ -28,27 +28,12 @@ import java.util.concurrent.TimeUnit
|
||||
|
||||
buildscript {
|
||||
repositories {
|
||||
mavenCentral()
|
||||
|
||||
maven {
|
||||
name 'forge'
|
||||
url 'https://maven.minecraftforge.net'
|
||||
}
|
||||
maven {
|
||||
// GTNH RetroFuturaGradle and ASM Fork
|
||||
name "GTNH Maven"
|
||||
url "http://jenkins.usrv.eu:8081/nexus/content/groups/public/"
|
||||
allowInsecureProtocol = true
|
||||
}
|
||||
maven {
|
||||
name 'sonatype'
|
||||
url 'https://oss.sonatype.org/content/repositories/snapshots/'
|
||||
}
|
||||
maven {
|
||||
name 'Scala CI dependencies'
|
||||
url 'https://repo1.maven.org/maven2/'
|
||||
}
|
||||
|
||||
mavenLocal()
|
||||
}
|
||||
}
|
||||
@@ -69,7 +54,7 @@ plugins {
|
||||
id 'com.diffplug.spotless' version '6.13.0' apply false // 6.13.0 is the last jvm8 supporting version
|
||||
id 'com.modrinth.minotaur' version '2.+' apply false
|
||||
id 'com.matthewprenger.cursegradle' version '1.4.0' apply false
|
||||
id 'com.gtnewhorizons.retrofuturagradle' version '1.3.24'
|
||||
id 'com.gtnewhorizons.retrofuturagradle' version '1.3.26'
|
||||
}
|
||||
|
||||
print("You might want to check out './gradlew :faq' if your build fails.\n")
|
||||
@@ -302,7 +287,7 @@ if (apiPackage) {
|
||||
}
|
||||
|
||||
if (accessTransformersFile) {
|
||||
for (atFile in accessTransformersFile.split(",")) {
|
||||
for (atFile in accessTransformersFile.split(" ")) {
|
||||
String targetFile = "src/main/resources/META-INF/" + atFile.trim()
|
||||
if (!getFile(targetFile).exists()) {
|
||||
throw new GradleException("Could not resolve \"accessTransformersFile\"! Could not find " + targetFile)
|
||||
@@ -628,7 +613,7 @@ repositories {
|
||||
}
|
||||
maven {
|
||||
name = "ic2"
|
||||
url = getURL("https://maven.ic2.player.to/", "https://maven2.ic2.player.to/")
|
||||
url = getURL("https://maven2.ic2.player.to/", "https://maven.ic2.player.to/")
|
||||
content {
|
||||
includeGroup "net.industrial-craft"
|
||||
}
|
||||
@@ -687,6 +672,8 @@ configurations.all {
|
||||
substitute module('com.github.GTNewHorizons:SpongePoweredMixin') using module(mixinProviderSpecNoClassifer) withClassifier("dev") because("Unimixins replaces other mixin mods")
|
||||
substitute module('com.github.GTNewHorizons:SpongeMixins') using module(mixinProviderSpecNoClassifer) withClassifier("dev") because("Unimixins replaces other mixin mods")
|
||||
substitute module('io.github.legacymoddingmc:unimixins') using module(mixinProviderSpecNoClassifer) withClassifier("dev") because("Our previous unimixins upload was missing the dev classifier")
|
||||
|
||||
substitute module('org.scala-lang:scala-library:2.11.1') using module('org.scala-lang:scala-library:2.11.5') because('To allow mixing with Java 8 targets')
|
||||
}
|
||||
}
|
||||
|
||||
@@ -793,12 +780,12 @@ ext.java17PatchDependenciesCfg = configurations.create("java17PatchDependencies"
|
||||
}
|
||||
|
||||
dependencies {
|
||||
def lwjgl3ifyVersion = '1.5.1'
|
||||
def lwjgl3ifyVersion = '1.5.7'
|
||||
if (modId != 'lwjgl3ify') {
|
||||
java17Dependencies("com.github.GTNewHorizons:lwjgl3ify:${lwjgl3ifyVersion}")
|
||||
}
|
||||
if (modId != 'hodgepodge') {
|
||||
java17Dependencies('com.github.GTNewHorizons:Hodgepodge:2.3.17')
|
||||
java17Dependencies('com.github.GTNewHorizons:Hodgepodge:2.3.35')
|
||||
}
|
||||
|
||||
java17PatchDependencies("com.github.GTNewHorizons:lwjgl3ify:${lwjgl3ifyVersion}:forgePatches") {transitive = false}
|
||||
@@ -1310,7 +1297,7 @@ def addCurseForgeRelation(String type, String name) {
|
||||
|
||||
// Updating
|
||||
|
||||
def buildscriptGradleVersion = "8.2.1"
|
||||
def buildscriptGradleVersion = "8.5"
|
||||
|
||||
tasks.named('wrapper', Wrapper).configure {
|
||||
gradleVersion = buildscriptGradleVersion
|
||||
|
||||
+2
-2
@@ -1,6 +1,6 @@
|
||||
// Add your dependencies here
|
||||
|
||||
dependencies {
|
||||
api("com.github.GTNewHorizons:CodeChickenLib:1.1.8:dev")
|
||||
devOnlyNonPublishable("com.github.GTNewHorizons:NotEnoughItems:2.4.9-GTNH:dev")
|
||||
api("com.github.GTNewHorizons:CodeChickenLib:1.2.0:dev")
|
||||
devOnlyNonPublishable("com.github.GTNewHorizons:NotEnoughItems:2.4.13-GTNH:dev")
|
||||
}
|
||||
Vendored
BIN
Binary file not shown.
+2
-1
@@ -1,6 +1,7 @@
|
||||
distributionBase=GRADLE_USER_HOME
|
||||
distributionPath=wrapper/dists
|
||||
distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-bin.zip
|
||||
distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
|
||||
networkTimeout=10000
|
||||
validateDistributionUrl=true
|
||||
zipStoreBase=GRADLE_USER_HOME
|
||||
zipStorePath=wrapper/dists
|
||||
@@ -130,10 +130,13 @@ location of your Java installation."
|
||||
fi
|
||||
else
|
||||
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
|
||||
location of your Java installation."
|
||||
fi
|
||||
fi
|
||||
|
||||
# Increase the maximum file descriptors if we can.
|
||||
|
||||
@@ -1,6 +1,5 @@
|
||||
package codechicken.multipart.minecraft;
|
||||
|
||||
import cpw.mods.fml.relauncher.ReflectionHelper;
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.block.BlockButton;
|
||||
import net.minecraft.entity.Entity;
|
||||
@@ -17,12 +16,6 @@ import codechicken.lib.vec.Cuboid6;
|
||||
import codechicken.lib.vec.Vector3;
|
||||
import codechicken.multipart.IFaceRedstonePart;
|
||||
|
||||
import java.lang.reflect.Array;
|
||||
import java.lang.reflect.Field;
|
||||
import java.lang.reflect.InvocationTargetException;
|
||||
import java.lang.reflect.Method;
|
||||
import java.util.Arrays;
|
||||
|
||||
public class ButtonPart extends McSidedMetaPart implements IFaceRedstonePart {
|
||||
|
||||
public static BlockButton stoneButton = (BlockButton) Blocks.stone_button;
|
||||
@@ -32,19 +25,23 @@ public class ButtonPart extends McSidedMetaPart implements IFaceRedstonePart {
|
||||
public static Cuboid6[] cuboidRegions = setupCuboids();
|
||||
|
||||
/**
|
||||
* Capture the boxes of all 16 button states, copying all button hitboxes directly
|
||||
* We do this so any button mixins will use the proper mixed hitbox size.
|
||||
* So mods like Et Futurum Requiem which add floor/ceiling buttons need no extra setup to have proper block bounds.
|
||||
* Capture the boxes of all 16 button states, copying all button hitboxes directly We do this so any button mixins
|
||||
* will use the proper mixed hitbox size. So mods like Et Futurum Requiem which add floor/ceiling buttons need no
|
||||
* extra setup to have proper block bounds.
|
||||
*/
|
||||
private static Cuboid6[] setupCuboids() {
|
||||
Cuboid6[] regions = new Cuboid6[16];
|
||||
for (int i = 0; i < regions.length; i++) {
|
||||
woodenButton.setBlockBoundsForItemRender(); //Reset bounds
|
||||
woodenButton.func_150043_b(i); //Set button bounds based on meta; this is how buttons change their hitbox
|
||||
woodenButton.setBlockBoundsForItemRender(); // Reset bounds
|
||||
woodenButton.func_150043_b(i); // Set button bounds based on meta; this is how buttons change their hitbox
|
||||
regions[i] = new Cuboid6(
|
||||
woodenButton.getBlockBoundsMinX(), woodenButton.getBlockBoundsMinY(), woodenButton.getBlockBoundsMinZ(),
|
||||
woodenButton.getBlockBoundsMaxX(), woodenButton.getBlockBoundsMaxY(), woodenButton.getBlockBoundsMaxZ()
|
||||
); //Use the button hitbox to generate a Cuboid6 region. This isn't the actual instance, we'll copy from this later.
|
||||
woodenButton.getBlockBoundsMinX(),
|
||||
woodenButton.getBlockBoundsMinY(),
|
||||
woodenButton.getBlockBoundsMinZ(),
|
||||
woodenButton.getBlockBoundsMaxX(),
|
||||
woodenButton.getBlockBoundsMaxY(),
|
||||
woodenButton.getBlockBoundsMaxZ()); // Use the button hitbox to generate a Cuboid6 region. This
|
||||
// isn't the actual instance, we'll copy from this later.
|
||||
}
|
||||
return regions;
|
||||
}
|
||||
@@ -84,8 +81,8 @@ public class ButtonPart extends McSidedMetaPart implements IFaceRedstonePart {
|
||||
|
||||
@Override
|
||||
public Cuboid6 getBounds() {
|
||||
//Somehow I got a crash here for meta 20? Let's wrap it to be safe
|
||||
return cuboidRegions[meta & 15].copy();//these objects get transformed I think, so we need to make a copy.
|
||||
// Somehow I got a crash here for meta 20? Let's wrap it to be safe
|
||||
return cuboidRegions[meta & 15].copy();// these objects get transformed I think, so we need to make a copy.
|
||||
}
|
||||
|
||||
public static McBlockPart placement(World world, BlockCoord pos, int side, int type) {
|
||||
|
||||
@@ -25,7 +25,7 @@ public abstract class McSidedMetaPart extends McMetaPart implements TFacePart {
|
||||
|
||||
public boolean canStay() {
|
||||
int side = sideForMeta(meta);
|
||||
if(side < 0 || side > 5) return false;
|
||||
if (side < 0 || side > 5) return false;
|
||||
|
||||
BlockCoord pos = new BlockCoord(tile()).offset(side);
|
||||
return world().isSideSolid(pos.x, pos.y, pos.z, ForgeDirection.getOrientation(side ^ 1));
|
||||
|
||||
Reference in new issue
Block a user