aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--build.gradle4
-rw-r--r--dependencies.gradle4
-rw-r--r--gradle.properties3
-rw-r--r--src/main/java/bloodasp/galacticgreg/GT_Worldgen_GT_Ore_Layer_Space.java6
-rw-r--r--src/main/java/bloodasp/galacticgreg/GT_Worldgenerator_Space.java8
-rw-r--r--src/main/java/bloodasp/galacticgreg/ModRegisterer.java8
-rw-r--r--src/main/java/bloodasp/galacticgreg/schematics/SpaceSchematic.java7
7 files changed, 29 insertions, 11 deletions
diff --git a/build.gradle b/build.gradle
index 952a3c59be..3eb19a269d 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,4 +1,4 @@
-//version: 1704650211
+//version: 1704751096
/*
DO NOT CHANGE THIS FILE!
Also, you may replace this file at any time if there is an update available.
@@ -786,7 +786,7 @@ dependencies {
java17Dependencies("com.github.GTNewHorizons:lwjgl3ify:${lwjgl3ifyVersion}")
}
if (modId != 'hodgepodge') {
- java17Dependencies('com.github.GTNewHorizons:Hodgepodge:2.3.35')
+ java17Dependencies('com.github.GTNewHorizons:Hodgepodge:2.4.4')
}
java17PatchDependencies("com.github.GTNewHorizons:lwjgl3ify:${lwjgl3ifyVersion}:forgePatches") {transitive = false}
diff --git a/dependencies.gradle b/dependencies.gradle
index f6d86e5f5a..1a4675dd3d 100644
--- a/dependencies.gradle
+++ b/dependencies.gradle
@@ -1,8 +1,8 @@
// Add your dependencies here
dependencies {
- api("com.github.GTNewHorizons:Galacticraft:3.0.73-GTNH:dev")
- api("com.github.GTNewHorizons:bartworks:0.7.38:dev") {
+ api("com.github.GTNewHorizons:Galacticraft:3.1.1-GTNH:dev")
+ api("com.github.GTNewHorizons:bartworks:0.9.2:dev") {
exclude group:"com.github.GTNewHorizons", module:"GalacticGregGT5"
}
}
diff --git a/gradle.properties b/gradle.properties
index cc35c98f33..6c92d87508 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -58,6 +58,3 @@ containsMixinsAndOrCoreModOnly = false
# If enabled, you may use 'shadowImplementation' for dependencies. They will be integrated in your jar. It is your
# responsibility check the licence and request permission for distribution, if required.
usesShadowedDependencies = false
-
-# TODO: Remove when you modify this repository, it's been put in for automatic buildscript updates
-disableCheckstyle = true
diff --git a/src/main/java/bloodasp/galacticgreg/GT_Worldgen_GT_Ore_Layer_Space.java b/src/main/java/bloodasp/galacticgreg/GT_Worldgen_GT_Ore_Layer_Space.java
index 3f4308e1de..67bbb492f8 100644
--- a/src/main/java/bloodasp/galacticgreg/GT_Worldgen_GT_Ore_Layer_Space.java
+++ b/src/main/java/bloodasp/galacticgreg/GT_Worldgen_GT_Ore_Layer_Space.java
@@ -3,7 +3,11 @@ package bloodasp.galacticgreg;
import static gregtech.api.enums.GT_Values.oreveinPlacerOres;
import static gregtech.api.enums.GT_Values.oreveinPlacerOresMultiplier;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Random;
import net.minecraft.util.MathHelper;
import net.minecraft.world.World;
diff --git a/src/main/java/bloodasp/galacticgreg/GT_Worldgenerator_Space.java b/src/main/java/bloodasp/galacticgreg/GT_Worldgenerator_Space.java
index 4165d54d78..2a8a7bafd5 100644
--- a/src/main/java/bloodasp/galacticgreg/GT_Worldgenerator_Space.java
+++ b/src/main/java/bloodasp/galacticgreg/GT_Worldgenerator_Space.java
@@ -12,10 +12,16 @@ import net.minecraft.world.chunk.Chunk;
import net.minecraft.world.chunk.IChunkProvider;
import net.minecraftforge.common.ChestGenHooks;
-import bloodasp.galacticgreg.api.*;
+import bloodasp.galacticgreg.api.AsteroidBlockComb;
+import bloodasp.galacticgreg.api.BlockMetaComb;
import bloodasp.galacticgreg.api.Enums.DimensionType;
import bloodasp.galacticgreg.api.Enums.SpaceObjectType;
import bloodasp.galacticgreg.api.Enums.TargetBlockPosition;
+import bloodasp.galacticgreg.api.GTOreTypes;
+import bloodasp.galacticgreg.api.ISpaceObjectGenerator;
+import bloodasp.galacticgreg.api.ModDimensionDef;
+import bloodasp.galacticgreg.api.SpecialBlockComb;
+import bloodasp.galacticgreg.api.StructureInformation;
import bloodasp.galacticgreg.auxiliary.GTOreGroup;
import bloodasp.galacticgreg.bartworks.BW_Worldgen_Ore_Layer_Space;
import bloodasp.galacticgreg.bartworks.BW_Worldgen_Ore_SmallOre_Space;
diff --git a/src/main/java/bloodasp/galacticgreg/ModRegisterer.java b/src/main/java/bloodasp/galacticgreg/ModRegisterer.java
index 85f5b50953..9a917eafab 100644
--- a/src/main/java/bloodasp/galacticgreg/ModRegisterer.java
+++ b/src/main/java/bloodasp/galacticgreg/ModRegisterer.java
@@ -7,9 +7,15 @@ import java.util.List;
import net.minecraft.init.Blocks;
import net.minecraft.world.gen.ChunkProviderEnd;
-import bloodasp.galacticgreg.api.*;
+import bloodasp.galacticgreg.api.AsteroidBlockComb;
+import bloodasp.galacticgreg.api.Enums;
import bloodasp.galacticgreg.api.Enums.AllowedBlockPosition;
import bloodasp.galacticgreg.api.Enums.DimensionType;
+import bloodasp.galacticgreg.api.GTOreTypes;
+import bloodasp.galacticgreg.api.ModContainer;
+import bloodasp.galacticgreg.api.ModDBMDef;
+import bloodasp.galacticgreg.api.ModDimensionDef;
+import bloodasp.galacticgreg.api.SpecialBlockComb;
/**
* In this class, you'll find everything you need in order to tell GGreg what to do and where. Everything is done in
diff --git a/src/main/java/bloodasp/galacticgreg/schematics/SpaceSchematic.java b/src/main/java/bloodasp/galacticgreg/schematics/SpaceSchematic.java
index 7c560651c3..6d425c52ff 100644
--- a/src/main/java/bloodasp/galacticgreg/schematics/SpaceSchematic.java
+++ b/src/main/java/bloodasp/galacticgreg/schematics/SpaceSchematic.java
@@ -2,7 +2,12 @@ package bloodasp.galacticgreg.schematics;
import java.util.ArrayList;
-import javax.xml.bind.annotation.*;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlElementWrapper;
+import javax.xml.bind.annotation.XmlRootElement;
import net.minecraft.block.Block;
import net.minecraft.util.Vec3;