Skip to content

Commit

Permalink
Merge pull request #4 from ZZZank/kessjs
Browse files Browse the repository at this point in the history 
More RegistryInfo usage
  • Loading branch information
@ZZZank
ZZZank authored Jul 27, 2024
2 parents de6dc01 + 1dc1962 commit aa94a38
Show file tree
Hide file tree
Showing 70 changed files with 1,446 additions and 991 deletions.
126 changes: 30 additions & 96 deletions common/src/main/java/dev/latvian/kubejs/BuiltinKubeJSPlugin.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,38 +17,22 @@
import dev.latvian.kubejs.bindings.TextWrapper;
import dev.latvian.kubejs.bindings.UtilsWrapper;
import dev.latvian.kubejs.block.*;
import dev.latvian.kubejs.block.events.BlockRegistryEventJS;
import dev.latvian.kubejs.block.custom.BasicBlockType;
import dev.latvian.kubejs.block.custom.BlockType;
import dev.latvian.kubejs.block.custom.BlockTypes;
import dev.latvian.kubejs.block.custom.ShapedBlockType;
import dev.latvian.kubejs.block.custom.*;
import dev.latvian.kubejs.client.painter.Painter;
import dev.latvian.kubejs.client.painter.screen.AtlasTextureObject;
import dev.latvian.kubejs.client.painter.screen.GradientObject;
import dev.latvian.kubejs.client.painter.screen.RectangleObject;
import dev.latvian.kubejs.client.painter.screen.ScreenGroup;
import dev.latvian.kubejs.client.painter.screen.TextObject;
import dev.latvian.kubejs.client.painter.screen.*;
import dev.latvian.kubejs.entity.EntityJS;
import dev.latvian.kubejs.event.IEventHandler;
import dev.latvian.kubejs.fluid.FluidBuilder;
import dev.latvian.kubejs.fluid.FluidRegistryEventJS;
import dev.latvian.kubejs.fluid.FluidStackJS;
import dev.latvian.kubejs.fluid.FluidWrapper;
import dev.latvian.kubejs.generator.AssetJsonGenerator;
import dev.latvian.kubejs.generator.DataJsonGenerator;
import dev.latvian.kubejs.item.ItemBuilder;
import dev.latvian.kubejs.item.ItemStackJS;
import dev.latvian.kubejs.item.ItemTintFunction;
import dev.latvian.kubejs.item.custom.ArmorItemType;
import dev.latvian.kubejs.item.custom.BasicItemType;
import dev.latvian.kubejs.item.custom.ItemArmorTierEventJS;
import dev.latvian.kubejs.item.custom.ItemToolTierEventJS;
import dev.latvian.kubejs.item.custom.ItemType;
import dev.latvian.kubejs.item.custom.ItemTypes;
import dev.latvian.kubejs.item.custom.ToolItemType;
import dev.latvian.kubejs.item.custom.*;
import dev.latvian.kubejs.item.ingredient.IngredientJS;
import dev.latvian.kubejs.item.ingredient.IngredientStackJS;
import dev.latvian.kubejs.loot.LootBuilder;
import dev.latvian.kubejs.recipe.RegisterRecipeHandlersEvent;
import dev.latvian.kubejs.recipe.filter.RecipeFilter;
import dev.latvian.kubejs.recipe.ingredientaction.IngredientActionFilter;
Expand All @@ -65,8 +49,8 @@
import dev.latvian.kubejs.recipe.mod.MATagRecipeJS;
import dev.latvian.kubejs.recipe.mod.ShapedArtisanRecipeJS;
import dev.latvian.kubejs.recipe.mod.ShapelessArtisanRecipeJS;
import dev.latvian.kubejs.registry.RegistryInfo;
import dev.latvian.kubejs.registry.builder.SoundEventBuilder;
import dev.latvian.kubejs.registry.RegistryInfos;
import dev.latvian.kubejs.registry.types.SoundEventBuilder;
import dev.latvian.kubejs.registry.types.CustomStatBuilder;
import dev.latvian.kubejs.registry.types.enchantment.EnchantmentBuilder;
import dev.latvian.kubejs.registry.types.mobeffects.BasicMobEffect;
Expand All @@ -77,10 +61,10 @@
import dev.latvian.kubejs.registry.types.villagers.VillagerTypeBuilder;
import dev.latvian.kubejs.script.BindingsEvent;
import dev.latvian.kubejs.script.PlatformWrapper;
import dev.latvian.kubejs.script.RegistryTypeWrapperFactory;
import dev.latvian.kubejs.script.ScriptType;
import dev.latvian.kubejs.server.ServerSettings;
import dev.latvian.kubejs.text.Text;
import dev.latvian.kubejs.registry.BuilderBase;
import dev.latvian.kubejs.util.*;
import dev.latvian.kubejs.world.BlockContainerJS;
import dev.latvian.mods.rhino.mod.util.NBTWrapper;
Expand Down Expand Up @@ -153,10 +137,10 @@ public void init() {
ItemTypes.register(ArmorItemType.BOOTS);

//sound
RegistryInfo.SOUND_EVENT.addType("basic", SoundEventBuilder.class, SoundEventBuilder::new);
RegistryInfos.SOUND_EVENT.addType("basic", SoundEventBuilder.class, SoundEventBuilder::new);
//block
// RegistryInfo.BLOCK.addType("basic", BasicBlockJS.Builder.class, BasicBlockJS.Builder::new);
// RegistryInfo.BLOCK.addType("detector", DetectorBlock.Builder.class, DetectorBlock.Builder::new);
RegistryInfos.BLOCK.addType("basic", BlockBuilder.class, BlockBuilder::new);
RegistryInfos.BLOCK.addType("detector", DetectorBlock.Builder.class, DetectorBlock.Builder::new);
// RegistryInfo.BLOCK.addType("slab", SlabBlockBuilder.class, SlabBlockBuilder::new);
// RegistryInfo.BLOCK.addType("stairs", StairBlockBuilder.class, StairBlockBuilder::new);
// RegistryInfo.BLOCK.addType("fence", FenceBlockBuilder.class, FenceBlockBuilder::new);
Expand All @@ -168,7 +152,7 @@ public void init() {
// RegistryInfo.BLOCK.addType("crop", CropBlockBuilder.class, CropBlockBuilder::new);
// RegistryInfo.BLOCK.addType("cardinal", HorizontalDirectionalBlockBuilder.class, HorizontalDirectionalBlockBuilder::new);
//item
RegistryInfo.ITEM.addType("basic", ItemBuilder.class, ItemBuilder::new);
RegistryInfos.ITEM.addType("basic", ItemBuilder.class, ItemBuilder::new);
// RegistryInfo.ITEM.addType("sword", SwordItemBuilder.class, SwordItemBuilder::new);
// RegistryInfo.ITEM.addType("pickaxe", PickaxeItemBuilder.class, PickaxeItemBuilder::new);
// RegistryInfo.ITEM.addType("axe", AxeItemBuilder.class, AxeItemBuilder::new);
Expand All @@ -179,17 +163,17 @@ public void init() {
// RegistryInfo.ITEM.addType("chestplate", ArmorItemBuilder.Chestplate.class, ArmorItemBuilder.Chestplate::new);
// RegistryInfo.ITEM.addType("leggings", ArmorItemBuilder.Leggings.class, ArmorItemBuilder.Leggings::new);
// RegistryInfo.ITEM.addType("boots", ArmorItemBuilder.Boots.class, ArmorItemBuilder.Boots::new);
// RegistryInfo.ITEM.addType("music_disc", RecordItemJS.Builder.class, RecordItemJS.Builder::new);
RegistryInfos.ITEM.addType("music_disc", RecordItemJS.Builder.class, RecordItemJS.Builder::new);
//misc
// RegistryInfo.FLUID.addType("basic", FluidBuilder.class, FluidBuilder::new);
RegistryInfo.ENCHANTMENT.addType("basic", EnchantmentBuilder.class, EnchantmentBuilder::new);
RegistryInfo.MOB_EFFECT.addType("basic", BasicMobEffect.Builder.class, BasicMobEffect.Builder::new);
RegistryInfo.POTION.addType("basic", PotionBuilder.class, PotionBuilder::new);
RegistryInfo.PARTICLE_TYPE.addType("basic", ParticleTypeBuilder.class, ParticleTypeBuilder::new);
RegistryInfo.CUSTOM_STAT.addType("basic", CustomStatBuilder.class, CustomStatBuilder::new);
RegistryInfo.POINT_OF_INTEREST_TYPE.addType("basic", PoiTypeBuilder.class, PoiTypeBuilder::new);
RegistryInfo.VILLAGER_TYPE.addType("basic", VillagerTypeBuilder.class, VillagerTypeBuilder::new);
RegistryInfo.VILLAGER_PROFESSION.addType("basic", VillagerProfessionBuilder.class, VillagerProfessionBuilder::new);
RegistryInfos.FLUID.addType("basic", FluidBuilder.class, FluidBuilder::new);
RegistryInfos.ENCHANTMENT.addType("basic", EnchantmentBuilder.class, EnchantmentBuilder::new);
RegistryInfos.MOB_EFFECT.addType("basic", BasicMobEffect.Builder.class, BasicMobEffect.Builder::new);
RegistryInfos.POTION.addType("basic", PotionBuilder.class, PotionBuilder::new);
RegistryInfos.PARTICLE_TYPE.addType("basic", ParticleTypeBuilder.class, ParticleTypeBuilder::new);
RegistryInfos.CUSTOM_STAT.addType("basic", CustomStatBuilder.class, CustomStatBuilder::new);
RegistryInfos.POINT_OF_INTEREST_TYPE.addType("basic", PoiTypeBuilder.class, PoiTypeBuilder::new);
RegistryInfos.VILLAGER_TYPE.addType("basic", VillagerTypeBuilder.class, VillagerTypeBuilder::new);
RegistryInfos.VILLAGER_PROFESSION.addType("basic", VillagerProfessionBuilder.class, VillagerProfessionBuilder::new);
//TODO: ENTITY_TYPE
//TODO: BLOCK_ENTITY_TYPE
}
Expand All @@ -199,12 +183,12 @@ public void initStartup() {
new ItemToolTierEventJS().post(KubeJSEvents.ITEM_REGISTRY_TOOL_TIERS);
new ItemArmorTierEventJS().post(KubeJSEvents.ITEM_REGISTRY_ARMOR_TIERS);

for (var registryInfo : RegistryInfo.WITH_TYPE.values()) {
for (var registryInfo : RegistryInfos.WITH_TYPE.values()) {
registryInfo.fireRegistryEvent();
}
new BlockRegistryEventJS().post(KubeJSEvents.BLOCK_REGISTRY);
// new BlockRegistryEventJS().post(KubeJSEvents.BLOCK_REGISTRY);
// new ItemRegistryEventJS().post(KubeJSEvents.ITEM_REGISTRY);
new FluidRegistryEventJS().post(KubeJSEvents.FLUID_REGISTRY);
// new FluidRegistryEventJS().post(KubeJSEvents.FLUID_REGISTRY);
}

@Override
Expand All @@ -215,6 +199,7 @@ public void clientInit() {
Painter.INSTANCE.registerObject("text", TextObject::new);
Painter.INSTANCE.registerObject("atlas_texture", AtlasTextureObject::new);
Painter.INSTANCE.registerObject("gradient", GradientObject::new);
Painter.INSTANCE.registerObject("item", ItemObject::new);
}

@Override
Expand Down Expand Up @@ -465,6 +450,9 @@ public void addTypeWrappers(ScriptType type, TypeWrappers typeWrappers) {
typeWrappers.register(BlockTintFunction.class, BlockTintFunction::of);
typeWrappers.register(ItemTintFunction.class, ItemTintFunction::of);

//registry
RegistryTypeWrapperFactory.register(typeWrappers);

KubeJS.PROXY.clientTypeWrappers(typeWrappers);
}

Expand Down Expand Up @@ -551,77 +539,23 @@ public void addRecipes(RegisterRecipeHandlersEvent event) {

@Override
public void generateDataJsons(DataJsonGenerator generator) {
for (BuilderBase<?> builder : RegistryInfo.ALL_BUILDERS) {
for (var builder : RegistryInfos.ALL_BUILDERS) {
builder.generateDataJsons(generator);
}

for (BlockBuilder builder : KubeJSObjects.BLOCKS.values()) {
if (builder.lootTable != null) {
LootBuilder lootBuilder = new LootBuilder(null);
lootBuilder.type = "minecraft:block";
builder.lootTable.accept(lootBuilder);
generator.json(builder.newID("loot_tables/blocks/", ""), lootBuilder.toJson());
}

builder.type.generateData(builder, generator);
}

for (ItemBuilder builder : KubeJSObjects.ITEMS.values()) {
builder.type.generateData(builder, generator);
}
}

@Override
public void generateAssetJsons(AssetJsonGenerator generator) {
for (BuilderBase<?> builder : RegistryInfo.ALL_BUILDERS) {
for (var builder : RegistryInfos.ALL_BUILDERS) {
builder.generateAssetJsons(generator);
}

for (DetectorInstance detector : KubeJSObjects.DETECTORS.values()) {
generator.blockState(new ResourceLocation(KubeJS.MOD_ID, "detector_" + detector.id), bs -> {
bs.variant("powered=false", "kubejs:block/detector");
bs.variant("powered=true", "kubejs:block/detector_on");
});

generator.itemModel(new ResourceLocation(KubeJS.MOD_ID, "detector_" + detector.id), m -> {
m.parent(KubeJS.MOD_ID + ":block/detector");
});
}

for (BlockBuilder builder : KubeJSObjects.BLOCKS.values()) {
builder.type.generateAssets(builder, generator);
}


for (ItemBuilder builder : KubeJSObjects.ITEMS.values()) {
builder.type.generateAssets(builder, generator);
}

for (FluidBuilder builder : KubeJSObjects.FLUIDS.values()) {
generator.json(builder.newID("blockstates/", ""), builder.getBlockstateJson());
generator.json(builder.newID("models/block/", ""), builder.getBlockModelJson());

JsonObject bucketModel = new JsonObject();
bucketModel.addProperty("parent", "kubejs:item/generated_bucket");
generator.json(builder.newID("models/item/", "_bucket"), bucketModel);
}
}

@Override
public void generateLang(Map<String, String> lang) {
lang.put("itemGroup.kubejs.kubejs", "KubeJS");

for (var builder : KubeJSObjects.ALL) {
if (builder.overrideLangJson && builder.display != null) {
lang.put(builder.translationKey, builder.display.getString());
}
}

for (var detector : KubeJSObjects.DETECTORS.values()) {
lang.put("block.kubejs.detector_" + detector.id, "KubeJS Detector [" + detector.id + "]");
}

for (var builder : KubeJSObjects.FLUIDS.values()) {
for (var builder : RegistryInfos.ALL_BUILDERS) {
if (builder.overrideLangJson && builder.display != null) {
lang.put(builder.translationKey, builder.display.getString());
}
Expand Down
3 changes: 2 additions & 1 deletion common/src/main/java/dev/latvian/kubejs/KubeJS.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
import dev.latvian.kubejs.player.KubeJSPlayerEventHandler;
import dev.latvian.kubejs.recipe.KubeJSRecipeEventHandler;
import dev.latvian.kubejs.registry.RegistryInfo;
import dev.latvian.kubejs.registry.RegistryInfos;
import dev.latvian.kubejs.registry.types.tab.CreativeTabRegistryEventJS;
import dev.latvian.kubejs.script.ScriptFileInfo;
import dev.latvian.kubejs.script.ScriptManager;
Expand Down Expand Up @@ -142,7 +143,7 @@ public KubeJS() throws Throwable {
KubeJSServerEventHandler.init();
KubeJSRecipeEventHandler.init();

RegistryInfo.MAP.values().forEach(RegistryInfo::registerArch);
RegistryInfos.MAP.values().forEach(RegistryInfo::registerArch);

PROXY.init();
}
Expand Down
2 changes: 2 additions & 0 deletions common/src/main/java/dev/latvian/kubejs/KubeJSEvents.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,8 @@ public class KubeJSEvents {
public static final String CLIENT_PAINT_WORLD = "client.paint_world";
public static final String CLIENT_PAINTER_UPDATED = "client.painter_updated";
public static final String CLIENT_LANG = "client.lang";
public static final String CLIENT_ATLAS_STITCH = "client.atlas_stitch";
public static final String CLIENT_GENERATE_ASSET = "client.generate_asset";
//server
public static final String SERVER_LOAD = "server.load";
public static final String SERVER_UNLOAD = "server.unload";
Expand Down
32 changes: 17 additions & 15 deletions common/src/main/java/dev/latvian/kubejs/KubeJSObjects.java
View file
Original file line number Diff line number Diff line change
@@ -1,31 +1,33 @@
package dev.latvian.kubejs;

import dev.latvian.kubejs.block.BlockBuilder;
import dev.latvian.kubejs.block.DetectorInstance;
import dev.latvian.kubejs.fluid.FluidBuilder;
import dev.latvian.kubejs.item.ItemBuilder;
import dev.latvian.kubejs.registry.BuilderBase;
import dev.latvian.kubejs.registry.RegistryInfos;
import dev.latvian.kubejs.util.UtilsJS;
import net.minecraft.resources.ResourceLocation;

import java.util.ArrayList;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import java.util.*;

/**
* @author LatvianModder
*/
@Deprecated
public class KubeJSObjects {
public static final List<BuilderBase> ALL = new ArrayList<>();
public static final Map<ResourceLocation, ItemBuilder> ITEMS = new LinkedHashMap<>();
public static final Map<ResourceLocation, BlockBuilder> BLOCKS = new LinkedHashMap<>();
public static final Map<ResourceLocation, FluidBuilder> FLUIDS = new LinkedHashMap<>();
public static final Map<String, DetectorInstance> DETECTORS = new LinkedHashMap<>();
@Deprecated
public static final List<BuilderBase<?>> ALL = RegistryInfos.ALL_BUILDERS;
@Deprecated
public static final Map<ResourceLocation, ItemBuilder> ITEMS = UtilsJS.cast(Collections.unmodifiableMap(RegistryInfos.ITEM.objects));
@Deprecated
public static final Map<ResourceLocation, BlockBuilder> BLOCKS = UtilsJS.cast(Collections.unmodifiableMap(RegistryInfos.BLOCK.objects));
@Deprecated
public static final Map<ResourceLocation, FluidBuilder> FLUIDS = UtilsJS.cast(Collections.unmodifiableMap(RegistryInfos.FLUID.objects));

public static void register() {
ALL.clear();
ITEMS.clear();
BLOCKS.clear();
FLUIDS.clear();
public static void register() {
// ALL.clear();
// ITEMS.clear();
// BLOCKS.clear();
// FLUIDS.clear();
}
}
9 changes: 6 additions & 3 deletions common/src/main/java/dev/latvian/kubejs/KubeJSOtherEventHandler.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,10 @@
* @author LatvianModder
*/
public class KubeJSOtherEventHandler {
public static void init() {
new SoundRegistryEventJS(id -> KubeJSRegistries.soundEvents().register(id, () -> new SoundEvent(id))).post(ScriptType.STARTUP, KubeJSEvents.SOUND_REGISTRY);
}
public static void init() {
new SoundRegistryEventJS(
id -> KubeJSRegistries.soundEvents().register(id, () -> new SoundEvent(id))
)
.post(ScriptType.STARTUP, KubeJSEvents.SOUND_REGISTRY);
}
}
Loading

0 comments on commit aa94a38

Please sign in to comment.