Skip to content

Commit 263bcc0

Browse files
ShnupbupsShnupbups
authored
Merge pull request #323 from Mixinors/development-1.16.3
1.11.1
2 parents 108ea7e + c242cde commit 263bcc0

File tree

233 files changed

+5923
-1407
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

233 files changed

+5923
-1407
lines changed

‎astromine-core/src/datagen/java/com/github/chainmailstudios/astromine/datagen/entrypoint/DatagenInitializer.java‎

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,18 @@
11
package com.github.chainmailstudios.astromine.datagen.entrypoint;
22

33
import com.github.chainmailstudios.astromine.AstromineCommon;
4-
import com.github.chainmailstudios.astromine.datagen.registry.*;
5-
import me.shedaniel.cloth.api.datagen.v1.*;
4+
import com.github.chainmailstudios.astromine.datagen.registry.AstromineLootTableGenerators;
5+
import com.github.chainmailstudios.astromine.datagen.registry.AstromineMaterialSets;
6+
import com.github.chainmailstudios.astromine.datagen.registry.AstromineModelStateGenerators;
7+
import com.github.chainmailstudios.astromine.datagen.registry.AstromineRecipeGenerators;
8+
import com.github.chainmailstudios.astromine.datagen.registry.AstromineTagGenerators;
9+
import com.github.chainmailstudios.astromine.datagen.registry.AstromineWorldGenGenerators;
10+
import me.shedaniel.cloth.api.datagen.v1.DataGeneratorHandler;
11+
import me.shedaniel.cloth.api.datagen.v1.LootTableData;
12+
import me.shedaniel.cloth.api.datagen.v1.ModelStateData;
13+
import me.shedaniel.cloth.api.datagen.v1.RecipeData;
14+
import me.shedaniel.cloth.api.datagen.v1.TagData;
15+
import me.shedaniel.cloth.api.datagen.v1.WorldGenData;
616

717
import java.nio.file.Path;
818
import java.nio.file.Paths;

‎astromine-core/src/datagen/java/com/github/chainmailstudios/astromine/datagen/generator/modelstate/onetime/SimpleBlockItemModelGenerator.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package com.github.chainmailstudios.astromine.datagen.generator.modelstate.onetime;
22

33
import net.minecraft.block.Block;
4-
import net.minecraft.data.client.model.ModelIds;
54

65
import me.shedaniel.cloth.api.datagen.v1.ModelStateData;
76

‎astromine-core/src/datagen/java/com/github/chainmailstudios/astromine/datagen/generator/modelstate/onetime/SimpleBlockItemModelStateGenerator.java‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,6 @@
55

66
import me.shedaniel.cloth.api.datagen.v1.ModelStateData;
77

8-
import java.util.Arrays;
9-
import java.util.List;
10-
118
public class SimpleBlockItemModelStateGenerator extends GenericBlockModelStateGenerator {
129
public SimpleBlockItemModelStateGenerator(Block... blocks) {
1310
super(blocks);

‎astromine-core/src/datagen/java/com/github/chainmailstudios/astromine/datagen/generator/recipe/onetime/BlastingRecipeGenerator.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
import net.minecraft.item.ItemConvertible;
66
import net.minecraft.recipe.Ingredient;
77
import net.minecraft.util.Identifier;
8-
import net.minecraft.util.registry.Registry;
98

109
import com.github.chainmailstudios.astromine.datagen.generator.recipe.onetime.base.CookingRecipeGenerator;
1110
import me.shedaniel.cloth.api.datagen.v1.RecipeData;
@@ -26,7 +25,7 @@ public BlastingRecipeGenerator(Ingredient input, ItemConvertible output) {
2625
@Override
2726
public Identifier getRecipeId() {
2827
Identifier id = super.getRecipeId();
29-
return new Identifier(id.getNamespace(), id.getPath()+"_from_blasting");
28+
return new Identifier(id.getNamespace(), id.getPath() + "_from_blasting");
3029
}
3130

3231
@Override

‎astromine-core/src/datagen/java/com/github/chainmailstudios/astromine/datagen/generator/recipe/onetime/Crafting3x3RecipeGenerator.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
import net.minecraft.item.ItemConvertible;
44
import net.minecraft.recipe.Ingredient;
5-
import net.minecraft.util.Identifier;
65

76
public class Crafting3x3RecipeGenerator extends ShapedCraftingRecipeGenerator {
87
public Crafting3x3RecipeGenerator(ItemConvertible output, Ingredient input) {

‎astromine-core/src/datagen/java/com/github/chainmailstudios/astromine/datagen/generator/recipe/onetime/ShapedCraftingRecipeGenerator.java‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@
44
import net.minecraft.data.server.recipe.ShapedRecipeJsonFactory;
55
import net.minecraft.item.ItemConvertible;
66
import net.minecraft.recipe.Ingredient;
7-
import net.minecraft.util.Identifier;
8-
import net.minecraft.util.registry.Registry;
97

108
import com.github.chainmailstudios.astromine.datagen.generator.recipe.onetime.base.OneTimeRecipeGenerator;
119
import me.shedaniel.cloth.api.datagen.v1.RecipeData;
@@ -35,7 +33,7 @@ public ShapedCraftingRecipeGenerator addIngredient(char c, Ingredient ingredient
3533
@Override
3634
public void generate(RecipeData recipes) {
3735
if (ingredients.size() == 0) throw new IllegalStateException("recipe must have at least one ingredient");
38-
else if(pattern.length == 0) throw new IllegalStateException("recipe must have a pattern");
36+
else if (pattern.length == 0) throw new IllegalStateException("recipe must have a pattern");
3937
else {
4038
ShapedRecipeJsonFactory factory = ShapedRecipeJsonFactory
4139
.create(output, outputCount)

‎astromine-core/src/datagen/java/com/github/chainmailstudios/astromine/datagen/generator/recipe/onetime/ShapelessCraftingRecipeGenerator.java‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@
44
import net.minecraft.data.server.recipe.ShapelessRecipeJsonFactory;
55
import net.minecraft.item.ItemConvertible;
66
import net.minecraft.recipe.Ingredient;
7-
import net.minecraft.util.Identifier;
8-
import net.minecraft.util.registry.Registry;
97

108
import com.github.chainmailstudios.astromine.datagen.generator.recipe.onetime.base.OneTimeRecipeGenerator;
119
import me.shedaniel.cloth.api.datagen.v1.RecipeData;

‎astromine-core/src/datagen/java/com/github/chainmailstudios/astromine/datagen/generator/recipe/onetime/SlabCraftingRecipeGenerator.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
import net.minecraft.item.ItemConvertible;
44
import net.minecraft.recipe.Ingredient;
5-
import net.minecraft.util.Identifier;
65

76
public class SlabCraftingRecipeGenerator extends ShapedCraftingRecipeGenerator {
87
public SlabCraftingRecipeGenerator(ItemConvertible output, Ingredient base) {

‎astromine-core/src/datagen/java/com/github/chainmailstudios/astromine/datagen/generator/recipe/onetime/SmeltingRecipeGenerator.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
import net.minecraft.item.ItemConvertible;
66
import net.minecraft.recipe.Ingredient;
77
import net.minecraft.util.Identifier;
8-
import net.minecraft.util.registry.Registry;
98

109
import com.github.chainmailstudios.astromine.datagen.generator.recipe.onetime.base.CookingRecipeGenerator;
1110
import me.shedaniel.cloth.api.datagen.v1.RecipeData;
@@ -26,7 +25,7 @@ public SmeltingRecipeGenerator(Ingredient input, ItemConvertible output) {
2625
@Override
2726
public Identifier getRecipeId() {
2827
Identifier id = super.getRecipeId();
29-
return new Identifier(id.getNamespace(), id.getPath()+"_from_smelting");
28+
return new Identifier(id.getNamespace(), id.getPath() + "_from_smelting");
3029
}
3130

3231
@Override

‎astromine-core/src/datagen/java/com/github/chainmailstudios/astromine/datagen/generator/recipe/onetime/StairsCraftingRecipeGenerator.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
import net.minecraft.item.ItemConvertible;
44
import net.minecraft.recipe.Ingredient;
5-
import net.minecraft.util.Identifier;
65

76
public class StairsCraftingRecipeGenerator extends ShapedCraftingRecipeGenerator {
87
public StairsCraftingRecipeGenerator(ItemConvertible output, Ingredient base) {

0 commit comments

Comments
 (0)