Anvilcraft/DimDoors
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

You forgot some stuff.

Browse source
This commit is contained in:
Waterpicker 2021-10-11 06:42:58 -05:00
parent f43263c751
commit d12c069ae6
5 changed files with 26 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/datagen/java/org/dimdev/dimdoors/datagen/LimboDecayProvider.java
View file

@ -62,6 +62,7 @@ import com.google.gson.JsonObject;
import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.Logger;
import org.dimdev.dimdoors.block.ModBlocks; import org.dimdev.dimdoors.block.ModBlocks;
import org.dimdev.dimdoors.util.ResourceUtil;
import org.dimdev.dimdoors.world.decay.DecayPattern; import org.dimdev.dimdoors.world.decay.DecayPattern;
import org.dimdev.dimdoors.world.decay.DecayPredicate; import org.dimdev.dimdoors.world.decay.DecayPredicate;
import org.dimdev.dimdoors.world.decay.DecayProcessor; import org.dimdev.dimdoors.world.decay.DecayProcessor;
@ -75,6 +76,7 @@ import net.minecraft.data.DataCache;
import net.minecraft.data.DataGenerator; import net.minecraft.data.DataGenerator;
import net.minecraft.data.DataProvider; import net.minecraft.data.DataProvider;
import net.minecraft.loot.LootManager; import net.minecraft.loot.LootManager;
import net.minecraft.nbt.NbtCompound;
import net.minecraft.util.Identifier; import net.minecraft.util.Identifier;
import java.io.IOException; import java.io.IOException;
@ -186,8 +188,8 @@ public class LimboDecayProvider implements DataProvider {
public void run(BiConsumer<Identifier, JsonObject> consumer) { public void run(BiConsumer<Identifier, JsonObject> consumer) {
JsonObject object = new JsonObject(); JsonObject object = new JsonObject();
object.add("predicate", predicate.toJson(new JsonObject())); object.add("predicate", ResourceUtil.NBT_TO_JSON.apply(predicate.toNbt(new NbtCompound())));
object.add("processor", processor.toJson(new JsonObject())); object.add("processor", ResourceUtil.NBT_TO_JSON.apply(processor.toNbt(new NbtCompound())));
consumer.accept(id, object); consumer.accept(id, object);
} }

2
src/main/java/org/dimdev/dimdoors/util/ResourceUtil.java
View file

@ -29,6 +29,8 @@ public class ResourceUtil {
public static final ComposableFunction<JsonElement, NbtElement> JSON_TO_NBT = json -> JsonOps.INSTANCE.convertTo(NbtOps.INSTANCE, json); public static final ComposableFunction<JsonElement, NbtElement> JSON_TO_NBT = json -> JsonOps.INSTANCE.convertTo(NbtOps.INSTANCE, json);
public static final ComposableFunction<NbtElement, JsonElement> NBT_TO_JSON = json -> NbtOps.INSTANCE.convertTo(JsonOps.INSTANCE, json);
public static final ComposableFunction<InputStream, JsonElement> JSON_READER = inputStream -> GSON.fromJson(new InputStreamReader(inputStream), JsonElement.class); public static final ComposableFunction<InputStream, JsonElement> JSON_READER = inputStream -> GSON.fromJson(new InputStreamReader(inputStream), JsonElement.class);
public static final ComposableFunction<InputStream, NbtElement> NBT_READER = JSON_READER.andThenComposable(JSON_TO_NBT); public static final ComposableFunction<InputStream, NbtElement> NBT_READER = JSON_READER.andThenComposable(JSON_TO_NBT);
public static final ComposableFunction<InputStream, NbtCompound> COMPRESSED_NBT_READER = inputStream -> { public static final ComposableFunction<InputStream, NbtCompound> COMPRESSED_NBT_READER = inputStream -> {

14
src/main/java/org/dimdev/dimdoors/world/decay/predicates/SimpleDecayPredicate.java
View file

@ -6,6 +6,8 @@ import org.dimdev.dimdoors.world.decay.DecayPredicate;
import net.minecraft.block.Block; import net.minecraft.block.Block;
import net.minecraft.block.BlockState; import net.minecraft.block.BlockState;
import net.minecraft.block.Blocks; import net.minecraft.block.Blocks;
import net.minecraft.nbt.NbtCompound;
import net.minecraft.nbt.NbtElement;
import net.minecraft.util.Identifier; import net.minecraft.util.Identifier;
import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.BlockPos;
import net.minecraft.util.registry.Registry; import net.minecraft.util.registry.Registry;
@ -23,16 +25,16 @@ public class SimpleDecayPredicate implements DecayPredicate {
} }
@Override @Override
public DecayPredicate fromJson(JsonObject json) { public DecayPredicate fromNbt(NbtCompound nbt) {
block = Registry.BLOCK.get(Identifier.tryParse(json.get("block").getAsString())); block = Registry.BLOCK.get(Identifier.tryParse(nbt.getString("block")));
return this; return this;
} }
@Override @Override
public JsonObject toJson(JsonObject json) { public NbtCompound toNbt(NbtCompound nbt) {
DecayPredicate.super.toJson(json); DecayPredicate.super.toNbt(nbt);
json.addProperty("block", Registry.BLOCK.getId(block).toString()); nbt.putString("block", Registry.BLOCK.getId(block).toString());
return json; return nbt;
} }
@Override @Override

4
src/main/java/org/dimdev/dimdoors/world/decay/processors/SelfDecayProcessor.java
View file

@ -6,6 +6,8 @@ import com.google.gson.JsonObject;
import org.dimdev.dimdoors.world.decay.DecayProcessor; import org.dimdev.dimdoors.world.decay.DecayProcessor;
import net.minecraft.block.BlockState; import net.minecraft.block.BlockState;
import net.minecraft.nbt.NbtCompound;
import net.minecraft.nbt.NbtElement;
import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World; import net.minecraft.world.World;
@ -19,7 +21,7 @@ public class SelfDecayProcessor implements DecayProcessor {
} }
@Override @Override
public DecayProcessor fromJson(JsonObject json) { public DecayProcessor fromNbt(NbtCompound nbt) {
return this; return this;
} }

17
src/main/java/org/dimdev/dimdoors/world/decay/processors/SimpleDecayProcesor.java
View file

@ -6,6 +6,7 @@ import org.dimdev.dimdoors.world.decay.DecayProcessor;
import net.minecraft.block.Block; import net.minecraft.block.Block;
import net.minecraft.block.BlockState; import net.minecraft.block.BlockState;
import net.minecraft.block.Blocks; import net.minecraft.block.Blocks;
import net.minecraft.nbt.NbtCompound;
import net.minecraft.util.Identifier; import net.minecraft.util.Identifier;
import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.BlockPos;
import net.minecraft.util.registry.Registry; import net.minecraft.util.registry.Registry;
@ -26,18 +27,18 @@ public class SimpleDecayProcesor implements DecayProcessor {
} }
@Override @Override
public DecayProcessor fromJson(JsonObject json) { public DecayProcessor fromNbt(NbtCompound json) {
block = Registry.BLOCK.get(Identifier.tryParse(json.get("block").getAsString())); block = Registry.BLOCK.get(Identifier.tryParse(json.getString("block")));
entropy = json.get("entropy").getAsInt(); entropy = json.getInt("entropy");
return this; return this;
} }
@Override @Override
public JsonObject toJson(JsonObject json) { public NbtCompound toNbt(NbtCompound nbt) {
DecayProcessor.super.toJson(json); DecayProcessor.super.toNbt(nbt);
json.addProperty("block", Registry.BLOCK.getId(block).toString()); nbt.putString("block", Registry.BLOCK.getId(block).toString());
json.addProperty("entropy", entropy); nbt.putInt("entropy", entropy);
return json; return nbt;
} }
@Override @Override