Skip to content

Commit

Permalink
Some more work
Browse files Browse the repository at this point in the history
  • Loading branch information
@GirafiStudios
GirafiStudios committed Jun 11, 2023
1 parent b82c08a commit 811f3a1
Show file tree
Hide file tree
Showing 17 changed files with 51 additions and 38 deletions.
26 changes: 14 additions & 12 deletions src/main/java/com/teammetallurgy/aquaculture/Aquaculture.java
View file
Expand Up @@ -11,13 +11,15 @@
import com.teammetallurgy.aquaculture.misc.AquaConfig;
import cpw.mods.modlauncher.Environment;
import cpw.mods.modlauncher.Launcher;
import net.minecraft.core.registries.Registries;
import net.minecraft.network.chat.Component;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.world.entity.EntityType;
import net.minecraft.world.entity.SpawnPlacements;
import net.minecraft.world.item.CreativeModeTab;
import net.minecraft.world.item.CreativeModeTabs;
import net.minecraft.world.item.ItemStack;
import net.minecraft.world.level.block.Block;
import net.minecraft.world.level.levelgen.Heightmap;
import net.minecraft.world.level.storage.loot.predicates.LootItemConditionType;
import net.minecraftforge.event.BuildCreativeModeTabContentsEvent;
Expand All @@ -28,6 +30,8 @@
import net.minecraftforge.fml.event.lifecycle.FMLClientSetupEvent;
import net.minecraftforge.fml.event.lifecycle.FMLCommonSetupEvent;
import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext;
import net.minecraftforge.registries.DeferredRegister;
import net.minecraftforge.registries.ForgeRegistries;
import net.minecraftforge.registries.RegistryObject;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
Expand All @@ -38,16 +42,22 @@ public class Aquaculture {
public static final boolean IS_DEV = Launcher.INSTANCE.environment().getProperty(Environment.Keys.VERSION.get()).filter(v -> v.equals("MOD_DEV")).isPresent();
public final static String MOD_ID = "aquaculture";
public static final Logger LOG = LogManager.getLogger(MOD_ID);
public static CreativeModeTab GROUP;
public static LootItemConditionType BIOME_TAG_CHECK;
public static final DeferredRegister<CreativeModeTab> CREATIVE_TABS = DeferredRegister.create(Registries.CREATIVE_MODE_TAB, Aquaculture.MOD_ID);
public static final RegistryObject<CreativeModeTab> GROUP = CREATIVE_TABS.register("tab", () -> new CreativeModeTab.Builder(CreativeModeTab.Row.TOP,0)
.icon(() -> new ItemStack(AquaItems.IRON_FISHING_ROD.get()))
.title(Component.translatable("tabs." + MOD_ID + ".tab"))
.displayItems((featureFlagSet, tabOutput) -> {
AquaItems.ITEMS_FOR_TAB_LIST.forEach(registryObject -> tabOutput.accept(new ItemStack(registryObject.get())));
}).build()
);

public Aquaculture() {
instance = this;
final IEventBus modBus = FMLJavaModLoadingContext.get().getModEventBus();
modBus.addListener(this::setupCommon);
modBus.addListener(this::setupClient);
this.registerDeferredRegistries(modBus);
modBus.addListener(this::registerTabs);
modBus.addListener(this::addItemsToTabs);
ModLoadingContext.get().registerConfig(ModConfig.Type.COMMON, AquaConfig.spec);
AquacultureAPI.Tags.init();
Expand Down Expand Up @@ -78,24 +88,16 @@ private void setupClient(FMLClientSetupEvent event) {
public void registerDeferredRegistries(IEventBus modBus) {
AquaBlocks.BLOCK_DEFERRED.register(modBus);
AquaItems.ITEM_DEFERRED.register(modBus);
CREATIVE_TABS.register(modBus);
AquaBlockEntities.BLOCK_ENTITY_DEFERRED.register(modBus);
AquaEntities.ENTITY_DEFERRED.register(modBus);
AquaLootModifiers.LOOT_MODIFIER_DEFERRED.register(modBus);
AquaSounds.SOUND_EVENT_DEFERRED.register(modBus);
AquaGuis.MENU_DEFERRED.register(modBus);
FishFilletRecipe.IRECIPE_SERIALIZERS_DEFERRED.register(modBus);
AquaBiomeModifiers.BIOME_MODIFIER_SERIALIZERS_DEFERRED.register(modBus);
}

private void registerTabs(CreativeModeTabEvent.Register event) {
GROUP = event.registerCreativeModeTab(new ResourceLocation(MOD_ID, "tab"), builder -> builder
.icon(() -> new ItemStack(AquaItems.IRON_FISHING_ROD.get()))
.title(Component.translatable("tabs." + MOD_ID + ".tab"))
.displayItems((featureFlagSet, tabOutput) -> {
AquaItems.ITEMS_FOR_TAB_LIST.forEach(registryObject -> tabOutput.accept(new ItemStack(registryObject.get())));
})
);
}

private void addItemsToTabs(BuildCreativeModeTabContentsEvent event) {
if (event.getTabKey() == CreativeModeTabs.SPAWN_EGGS) {
AquaItems.SPAWN_EGGS.forEach(registryObject -> event.accept(new ItemStack(registryObject.get())));
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/com/teammetallurgy/aquaculture/api/AquacultureAPI.java
View file
Expand Up @@ -26,8 +26,8 @@ public class AquacultureAPI {
**/
public static FishData FISH_DATA = new FishData();

public static BaitItem createBait(int durability, int lureSpeedModifier, CreativeModeTab group) {
return new BaitItem(durability, lureSpeedModifier, group);
public static BaitItem createBait(int durability, int lureSpeedModifier) {
return new BaitItem(durability, lureSpeedModifier);
}

public static RegistryObject<Item> registerFishMount(@Nonnull String name) {
Expand Down
6 changes: 3 additions & 3 deletions src/main/java/com/teammetallurgy/aquaculture/init/AquaItems.java
View file
Expand Up @@ -27,7 +27,7 @@ public class AquaItems {
public static final RegistryObject<Item> GOLD_FISHING_ROD = registerWithTab(() -> new AquaFishingRodItem(Tiers.GOLD, new Item.Properties().defaultDurability(55)), "gold_fishing_rod");
public static final RegistryObject<Item> DIAMOND_FISHING_ROD = registerWithTab(() -> new AquaFishingRodItem(Tiers.DIAMOND, new Item.Properties().defaultDurability(450)), "diamond_fishing_rod");
public static final RegistryObject<Item> NEPTUNIUM_FISHING_ROD = registerWithTab(() -> new AquaFishingRodItem(AquacultureAPI.MATS.NEPTUNIUM, new Item.Properties().defaultDurability(1000)), "neptunium_fishing_rod");
public static final RegistryObject<Item> WORM = registerWithTab(() -> AquacultureAPI.createBait(20, 1, Aquaculture.GROUP), "worm");
public static final RegistryObject<Item> WORM = registerWithTab(() -> AquacultureAPI.createBait(20, 1), "worm");
public static final RegistryObject<Item> FISHING_LINE = registerWithTab(() -> new DyeableItem(0), "fishing_line");
public static final RegistryObject<Item> BOBBER = registerWithTab(() -> new DyeableItem(13838890), "bobber");

Expand Down Expand Up @@ -88,7 +88,7 @@ public class AquaItems {
public static final RegistryObject<Item> CARP = FishRegistry.register(FishItem::new, "carp", FishType.LARGE);
public static final RegistryObject<Item> CATFISH = FishRegistry.register(() -> new FishItem(FishItem.LARGE_FISH_RAW), "catfish", FishType.CATFISH);
public static final RegistryObject<Item> GAR = FishRegistry.register(FishItem::new, "gar", FishType.LONGNOSE);
public static final RegistryObject<Item> MINNOW = FishRegistry.register(() -> AquacultureAPI.createBait(50, 1, Aquaculture.GROUP), "minnow", FishType.SMALL);
public static final RegistryObject<Item> MINNOW = FishRegistry.register(() -> AquacultureAPI.createBait(50, 1), "minnow", FishType.SMALL);
public static final RegistryObject<Item> MUSKELLUNGE = FishRegistry.register(FishItem::new, "muskellunge", FishType.LONGNOSE);
public static final RegistryObject<Item> PERCH = FishRegistry.register(() -> new FishItem(FishItem.SMALL_FISH_RAW), "perch", FishType.SMALL);
public static final RegistryObject<Item> ARAPAIMA = FishRegistry.register(() -> new FishItem(FishItem.LARGE_FISH_RAW), "arapaima", FishType.LONGNOSE);
Expand All @@ -99,7 +99,7 @@ public class AquaItems {
public static final RegistryObject<Item> JELLYFISH = FishRegistry.register(SimpleItem::new, "jellyfish", FishType.JELLYFISH);
public static final RegistryObject<Item> RED_GROUPER = FishRegistry.register(FishItem::new, "red_grouper");
public static final RegistryObject<Item> TUNA = FishRegistry.register(() -> new FishItem(FishItem.LARGE_FISH_RAW), "tuna", FishType.LARGE);
public static final RegistryObject<Item> LEECH = registerWithTab(() -> AquacultureAPI.createBait(35, 1, Aquaculture.GROUP), "leech");
public static final RegistryObject<Item> LEECH = registerWithTab(() -> AquacultureAPI.createBait(35, 1), "leech");
public static final RegistryObject<Item> GOLDFISH = registerWithTab(SimpleItem::new, "goldfish");
public static final RegistryObject<Item> BOX_TURTLE = registerWithTab(SimpleItem::new, "box_turtle");
public static final RegistryObject<Item> ARRAU_TURTLE = registerWithTab(SimpleItem::new, "arrau_turtle");
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/com/teammetallurgy/aquaculture/init/AquaLootTables.java
View file
Expand Up @@ -44,7 +44,7 @@ private static ResourceLocation register(String path) {
return BuiltInLootTables.register(new ResourceLocation(Aquaculture.MOD_ID, path));
}

@SubscribeEvent
/*@SubscribeEvent
public static void onLootTableLoad(LootTableLoadEvent event) {
ResourceLocation name = event.getName();
if (name.equals(BuiltInLootTables.FISHING)) {
Expand All @@ -58,7 +58,7 @@ public static void onLootTableLoad(LootTableLoadEvent event) {
}
}
}
}
}*/

private static LootPoolEntryContainer getInjectEntry(ResourceLocation location, int weight, int quality) {
return LootTableReference.lootTableReference(location).setWeight(weight).setQuality(quality).build();
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/teammetallurgy/aquaculture/item/BaitItem.java
View file
Expand Up @@ -10,7 +10,7 @@ public class BaitItem extends Item {
private final int lureSpeedModifier;
private final int durability;

public BaitItem(int durability, int lureSpeedModifier, CreativeModeTab group) {
public BaitItem(int durability, int lureSpeedModifier) {
super(new Item.Properties().setNoRepair());
this.lureSpeedModifier = lureSpeedModifier;
this.durability = durability;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/teammetallurgy/aquaculture/item/LootBoxItem.java
View file
Expand Up @@ -35,7 +35,7 @@ public InteractionResultHolder<ItemStack> use(Level world, Player player, @Nonnu

if (world instanceof ServerLevel serverLevel) {
LootParams.Builder builder = new LootParams.Builder(serverLevel);
List<ItemStack> loot = serverLevel.getServer().getLootData().getLootTable(this.lootTable).getRandomItems(builder.create(LootContextParamSets.EMPTY)); //TODO Test
List<ItemStack> loot = serverLevel.getServer().getLootData().getLootTable(this.lootTable).getRandomItems(builder.create(LootContextParamSets.EMPTY));
if (!loot.isEmpty()) {
ItemStack lootStack = loot.get(0);
player.displayClientMessage(Component.translatable("aquaculture.loot.open", lootStack.getHoverName()).withStyle(ChatFormatting.YELLOW), true);
Expand Down
15 changes: 8 additions & 7 deletions src/main/resources/data/aquaculture/loot_tables/gameplay/fishing/fish.json
View file
Expand Up @@ -9,7 +9,7 @@
"type": "minecraft:item",
"conditions": [
{
"condition": "minecraft:alternative",
"condition": "minecraft:any_of",
"terms": [
{
"condition": "aquaculture:biome_tag_check",
Expand All @@ -35,7 +35,7 @@
"type": "minecraft:item",
"conditions": [
{
"condition": "minecraft:alternative",
"condition": "minecraft:any_of",
"terms": [
{
"condition": "aquaculture:biome_tag_check",
Expand All @@ -61,7 +61,7 @@
"type": "minecraft:item",
"conditions": [
{
"condition": "minecraft:alternative",
"condition": "minecraft:any_of",
"terms": [
{
"condition": "aquaculture:biome_tag_check",
Expand Down Expand Up @@ -115,7 +115,7 @@
"type": "minecraft:item",
"conditions": [
{
"condition": "minecraft:alternative",
"condition": "minecraft:any_of",
"terms": [
{
"condition": "aquaculture:biome_tag_check",
Expand All @@ -141,7 +141,7 @@
"type": "minecraft:item",
"conditions": [
{
"condition": "minecraft:alternative",
"condition": "minecraft:any_of",
"terms": [
{
"condition": "aquaculture:biome_tag_check",
Expand All @@ -167,7 +167,7 @@
"type": "minecraft:item",
"conditions": [
{
"condition": "minecraft:alternative",
"condition": "minecraft:any_of",
"terms": [
{
"condition": "aquaculture:biome_tag_check",
Expand Down Expand Up @@ -520,5 +520,6 @@
}
]
}
]
],
"random_sequence": "aquaculture:gameplay/fishing/fish"
}
3 changes: 2 additions & 1 deletion src/main/resources/data/aquaculture/loot_tables/gameplay/fishing/junk.json
View file
Expand Up @@ -97,5 +97,6 @@
}
]
}
]
],
"random_sequence": "aquaculture:gameplay/fishing/junk"
}
3 changes: 2 additions & 1 deletion src/main/resources/data/aquaculture/loot_tables/gameplay/fishing/lava/fish.json
View file
Expand Up @@ -7,5 +7,6 @@

]
}
]
],
"random_sequence": "aquaculture:gameplay/fishing/lava/fish"
}
3 changes: 2 additions & 1 deletion src/main/resources/data/aquaculture/loot_tables/gameplay/fishing/lava/fishing.json
View file
Expand Up @@ -24,5 +24,6 @@
}
]
}
]
],
"random_sequence": "aquaculture:gameplay/fishing/lava/fishing"
}
3 changes: 2 additions & 1 deletion src/main/resources/data/aquaculture/loot_tables/gameplay/fishing/lava/junk.json
View file
Expand Up @@ -7,5 +7,6 @@

]
}
]
],
"random_sequence": "aquaculture:gameplay/fishing/lava/junk"
}
3 changes: 2 additions & 1 deletion src/main/resources/data/aquaculture/loot_tables/gameplay/fishing/lava/treasure.json
View file
Expand Up @@ -7,5 +7,6 @@

]
}
]
],
"random_sequence": "aquaculture:gameplay/fishing/lava/treasure"
}
3 changes: 2 additions & 1 deletion src/main/resources/data/aquaculture/loot_tables/gameplay/fishing/neptunium.json
View file
Expand Up @@ -34,5 +34,6 @@
}
]
}
]
],
"random_sequence": "aquaculture:gameplay/fishing/neptunium"
}
3 changes: 2 additions & 1 deletion src/main/resources/data/aquaculture/loot_tables/gameplay/fishing/nether/fish.json
View file
Expand Up @@ -7,5 +7,6 @@

]
}
]
],
"random_sequence": "aquaculture:gameplay/fishing/nether/fish"
}
3 changes: 2 additions & 1 deletion src/main/resources/data/aquaculture/loot_tables/gameplay/fishing/nether/fishing.json
View file
Expand Up @@ -24,5 +24,6 @@
}
]
}
]
],
"random_sequence": "aquaculture:gameplay/fishing/nether/fishing"
}
3 changes: 2 additions & 1 deletion src/main/resources/data/aquaculture/loot_tables/gameplay/fishing/nether/junk.json
View file
Expand Up @@ -7,5 +7,6 @@

]
}
]
],
"random_sequence": "aquaculture:gameplay/fishing/nether/junk"
}
3 changes: 2 additions & 1 deletion src/main/resources/data/aquaculture/loot_tables/gameplay/fishing/nether/treasure.json
View file
Expand Up @@ -7,5 +7,6 @@

]
}
]
],
"random_sequence": "aquaculture:gameplay/fishing/nether/treasure"
}

0 comments on commit 811f3a1

Please sign in to comment.