This commit is contained in:
glowredman committed 2024-03-29 14:51:56 +01:00
1 parent 79b942a7a9
commit b2e4e9ff87
10 files changed
+23 -69

No files matched your search

+5 -5
View File
@@ -1,9 +1,9 @@
// Add your dependencies here
dependencies {
implementation("com.github.GTNewHorizons:NotEnoughItems:2.5.3-GTNH:dev")
implementation("com.github.GTNewHorizons:Avaritia:1.48:dev")
implementation("com.github.GTNewHorizons:Universal-Singularities:8.6.7:dev")
implementation("com.github.GTNewHorizons:WanionLib:1.8.4:dev")
compileOnly("com.github.GTNewHorizons:CraftTweaker:3.3.0:dev") // optional
implementation("com.github.GTNewHorizons:NotEnoughItems:2.5.25-GTNH:dev")
implementation("com.github.GTNewHorizons:Avaritia:1.49:dev")
implementation("com.github.GTNewHorizons:Universal-Singularities:8.7.0:dev")
implementation("com.github.GTNewHorizons:WanionLib:1.9.0:dev")
compileOnly("com.github.GTNewHorizons:CraftTweaker:3.3.1:dev") // optional
}
+10 -9
View File
@@ -33,7 +33,7 @@ channel = stable
mappingsVersion = 12
# Defines other MCP mappings for dependency deobfuscation.
remoteMappings = https://raw.githubusercontent.com/MinecraftForge/FML/1.7.10/conf/
remoteMappings = https\://raw.githubusercontent.com/MinecraftForge/FML/1.7.10/conf/
# Select a default username for testing your mod. You can always override this per-run by running
# `./gradlew runClient --username=AnotherPlayer`, or configuring this command in your IDE.
@@ -41,19 +41,19 @@ developmentEnvironmentUserName = Developer
# Enables using modern Java syntax (up to version 17) via Jabel, while still targeting JVM 8.
# See https://github.com/bsideup/jabel for details on how this works.
enableModernJavaSyntax = false
enableModernJavaSyntax = true
# Enables injecting missing generics into the decompiled source code for a better coding experience.
# Turns most publicly visible List, Map, etc. into proper List<E>, Map<K, V> types.
enableGenericInjection = false
enableGenericInjection = true
# Generate a class with a String field for the mod version named as defined below.
# If generateGradleTokenClass is empty or not missing, no such class will be generated.
# If gradleTokenVersion is empty or missing, the field will not be present in the class.
generateGradleTokenClass =
generateGradleTokenClass = singulariteam.eternalsingularity.Tags
# Name of the token containing the project's current version to generate/replace.
gradleTokenVersion = GRADLETOKEN_VERSION
gradleTokenVersion = VERSION
# [DEPRECATED] Mod ID replacement token.
gradleTokenModId =
@@ -61,13 +61,16 @@ gradleTokenModId =
# [DEPRECATED] Mod name replacement token.
gradleTokenModName =
# [DEPRECATED] Mod Group replacement token.
gradleTokenGroupName =
# [DEPRECATED]
# Multiple source files can be defined here by providing a comma-separated list: Class1.java,Class2.java,Class3.java
# public static final String VERSION = "GRADLETOKEN_VERSION";
# The string's content will be replaced with your mod's version when compiled. You should use this to specify your mod's
# version in @Mod([...], version = VERSION, [...]).
# Leave these properties empty to skip individual token replacements.
replaceGradleTokenInFile = Reference.java
replaceGradleTokenInFile =
# In case your mod provides an API for other mods to implement you may declare its package here. Otherwise, you can
# leave this property empty.
@@ -123,7 +126,7 @@ includeWellKnownRepositories = true
usesMavenPublishing = true
# Maven repository to publish the mod to.
# mavenPublishUrl = https://nexus.gtnewhorizons.com/repository/releases/
# mavenPublishUrl = https\://nexus.gtnewhorizons.com/repository/releases/
# Publishing to Modrinth requires you to set the MODRINTH_TOKEN environment variable to your current Modrinth API token.
#
@@ -187,5 +190,3 @@ curseForgeRelations =
# This is meant to be set in $HOME/.gradle/gradle.properties.
# ideaCheckSpotlessOnBuild = true
# Non-GTNH properties
gradleTokenGroupName =
+1 -1
View File
@@ -17,7 +17,7 @@ pluginManagement {
}
plugins {
id 'com.gtnewhorizons.gtnhsettingsconvention' version '1.0.8'
id 'com.gtnewhorizons.gtnhsettingsconvention' version '1.0.19'
}
@@ -4,7 +4,7 @@ public final class Reference {
public static final String MOD_ID = "eternalsingularity";
public static final String MOD_NAME = "Eternal Singularity";
public static final String MOD_VERSION = "GRADLETOKEN_VERSION";
public static final String MOD_VERSION = Tags.VERSION;
public static final String MC_VERSION = "[1.7.10]";
static final String COMMON_PROXY = "singulariteam.eternalsingularity.proxy.CommonProxy";
static final String CLIENT_PROXY = "singulariteam.eternalsingularity.proxy.ClientProxy";
@@ -45,9 +45,8 @@ public class CompoundSingularityItem extends Item implements IHaloRenderItem, IC
return "item.combined.singularity." + MathHelper.clamp_int(getDamage(stack), 0, max);
}
@SuppressWarnings("unchecked")
@SideOnly(Side.CLIENT)
public void getSubItems(Item item, CreativeTabs tab, List list) {
public void getSubItems(Item item, CreativeTabs tab, List<ItemStack> list) {
for (int j = 0; j < max; j++) list.add(new ItemStack(item, 1, j));
}
@@ -29,7 +29,7 @@ import singulariteam.eternalsingularity.item.EternalSingularityItem;
public class CommonProxy {
private static ShapelessOreRecipe eternalSingularityRecipe = null;
private static final Set<Class> classSet = new HashSet<>();
private static final Set<Class<?>> classSet = new HashSet<>();
protected CompoundSingularityItem compoundSingularityItem = null;
private File configFile;
@@ -83,8 +83,6 @@ public class CosmicRenderStuffs {
return;
}
int coord = world.getLightBrightnessForSkyBlocks(x, y, z, 0);
int[] map = null;
try {
map = (int[]) mapfield.get(Minecraft.getMinecraft().entityRenderer);
@@ -94,11 +92,6 @@ public class CosmicRenderStuffs {
return;
}
int mx = (coord % 65536) / 16;
int my = (coord / 65536) / 16;
int lightcolour = map[my * 16 + mx];
setLightLevel(1.0F, 1.0F, 1.0F);
}
@@ -213,7 +213,6 @@ public class EternalItemRenderer implements IItemRenderer {
// ItemRenderer.renderItemIn2D(Tessellator.instance, f1, f2, f, f3, icon.getIconWidth(), icon.getIconHeight(),
// scale);
float r, g, b;
IIcon icon;
float f, f1, f2, f3;
float scale = 1F / 16F;
@@ -230,10 +229,6 @@ public class EternalItemRenderer implements IItemRenderer {
f2 = icon.getMinV();
f3 = icon.getMaxV();
int colour = item.getItem().getColorFromItemStack(item, i);
r = (float) (colour & 255) / 255.0F;
g = (float) (colour & 255) / 255.0F;
b = (float) (colour & 255) / 255.0F;
GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
ItemRenderer.renderItemIn2D(
Tessellator.instance,
+4 -8
View File
@@ -6,16 +6,12 @@
"name": "${modName}",
"version": "${modVersion}",
"mcversion": "${minecraftVersion}",
"url": "https://github.com/SinTh0r4s/MyMod",
"url": "https://www.curseforge.com/minecraft/mc-mods/eternal-singularity",
"updateUrl": "",
"authorList": ["SinTho0r4s"],
"authorList": ["RCXcrafter", "WanionCane", "Wealthyturtle"],
"credits": "",
"logoFile": "",
"logoFile": "EternalSingularityLogo.png",
"screenshots": [],
"parent": "",
"requiredMods": [],
"dependencies": [],
"dependants": [],
"useDependencyInformation": true
"parent": ""
}]
}
-30
View File
@@ -1,30 +0,0 @@
printf("Configuring spotless\n")
// Spotless autoformatter
// See https://github.com/diffplug/spotless/tree/main/plugin-gradle
// Can be locally toggled via spotless:off/spotless:on comments
spotless {
encoding 'UTF-8'
format 'misc', {
target '.gitignore'
trimTrailingWhitespace()
indentWithSpaces(4)
endWithNewline()
}
java {
toggleOffOn()
importOrder()
removeUnusedImports()
palantirJavaFormat('1.1.0') // last version supporting jvm 8
}
kotlin {
toggleOffOn()
ktfmt('0.39')
trimTrailingWhitespace()
indentWithSpaces(4)
endWithNewline()
}
}