Skip to content

Commit

Permalink
are capabilities the most broken or are enchantments the most broken …
Browse files Browse the repository at this point in the history
…who knows
  • Loading branch information
Lothrazar committed Feb 17, 2025
1 parent 483e9c0 commit 328943c
Show file tree
Hide file tree
Showing 56 changed files with 1,027 additions and 4,067 deletions.
10 changes: 2 additions & 8 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -171,17 +171,11 @@ tasks.named('jar', Jar).configure {
// See https://docs.gradle.org/current/dsl/org.gradle.language.jvm.tasks.ProcessResources.html
tasks.withType(ProcessResources).configureEach {
var replaceProperties = [
minecraft_version : minecraft_version,
// minecraft_version_range: minecraft_version_range,
minecraft_version : mc_version,
neo_version : neo_version,
// neo_version_range : neo_version_range,
// loader_version_range : loader_version_range,
mod_id : mod_id,
mod_name : mod_name,
mod_license : mod_license,
mod_version : mod_version,
mod_authors : mod_authors,
mod_description : mod_description
mod_version : mod_version
]
inputs.properties replaceProperties

Expand Down
13 changes: 2 additions & 11 deletions scripts/release.sh
Original file line number Diff line number Diff line change
@@ -1,14 +1,5 @@
#!/bin/bash

echo 'updating example configs...'
./gradlew build

cp ./run/config/cyclic.toml ./examples/config/cyclic.toml
cp ./run/config/cyclic-client.toml ./examples/config/cyclic-client.toml

echo '... done'

echo 'deploying...'

./gradlew cleanJar build signJar

echo 'jar deployed to ./build/libs/'
# ./scripts/dist.sh
2 changes: 1 addition & 1 deletion scripts/setup.sh
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
#!/bin/bash

./gradlew genEclipseRuns
./gradlew --refresh-dependencies
40 changes: 25 additions & 15 deletions src/main/java/com/lothrazar/cyclic/ModCyclic.java
Original file line number Diff line number Diff line change
@@ -1,5 +1,13 @@
package com.lothrazar.cyclic;

import com.lothrazar.cyclic.event.ClientInputEvents;
import com.lothrazar.cyclic.event.EventRender;
import net.neoforged.api.distmarker.Dist;
import net.neoforged.bus.api.IEventBus;
import net.neoforged.fml.ModContainer;
import net.neoforged.fml.common.Mod;
import net.neoforged.neoforge.common.NeoForge;
import net.neoforged.neoforge.common.NeoForgeMod;
import org.apache.logging.log4j.LogManager;
import com.lothrazar.cyclic.config.ConfigRegistry;
import com.lothrazar.cyclic.data.DataTags;
Expand All @@ -20,31 +28,32 @@
import com.lothrazar.cyclic.registry.SoundRegistry;
import com.lothrazar.cyclic.registry.TileRegistry;
import net.minecraft.world.entity.Entity;
import net.minecraftforge.common.ForgeMod;
import net.minecraftforge.common.MinecraftForge;
import net.minecraftforge.eventbus.api.IEventBus;
import net.minecraftforge.fml.DistExecutor;
import net.minecraftforge.fml.common.Mod;
import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext;

@Mod(ModCyclic.MODID)
public class ModCyclic {

public static final String MODID = "cyclic";
public static final CyclicLogger LOGGER = new CyclicLogger(LogManager.getLogger());

public ModCyclic() {
FMLJavaModLoadingContext.get().getModEventBus().addListener(EventRegistry::setup);
FMLJavaModLoadingContext.get().getModEventBus().addListener(ClientRegistryCyclic::setupClient);
DistExecutor.safeRunForDist(() -> ClientRegistryCyclic::new, () -> EventRegistry::new);
public ModCyclic(IEventBus bus, Dist dist, ModContainer container) {

bus.addListener(EventRegistry::setup);
if (dist.isClient()) {

bus.addListener(ClientRegistryCyclic::setupClient);

NeoForge.EVENT_BUS.register(new ClientInputEvents());
NeoForge.EVENT_BUS.register(new EventRender());
}

// DistExecutor.safeRunForDist(() -> ClientRegistryCyclic::new, () -> EventRegistry::new);
ConfigRegistry cfg = new ConfigRegistry();
cfg.setupMain();
cfg.setupClient();
DataTags.setup();
MinecraftForge.EVENT_BUS.addGenericListener(Entity.class, CapabilityRegistry::onAttachCapabilitiesPlayer);
MinecraftForge.EVENT_BUS.register(new CapabilityRegistry());
MinecraftForge.EVENT_BUS.register(new CommandRegistry());
IEventBus bus = FMLJavaModLoadingContext.get().getModEventBus();
// NeoForge.EVENT_BUS.addGenericListener(Entity.class, CapabilityRegistry::onAttachCapabilitiesPlayer); // TODO:
NeoForge.EVENT_BUS.register(new CapabilityRegistry());
NeoForge.EVENT_BUS.register(new CommandRegistry());
BlockRegistry.BLOCKS.register(bus);
ItemRegistry.ITEMS.register(bus);
TileRegistry.TILES.register(bus);
Expand All @@ -59,7 +68,8 @@ public ModCyclic() {
EnchantRegistry.ENCHANTMENTS.register(bus);
SoundRegistry.SOUND_EVENTS.register(bus);
LootModifierRegistry.LOOT.register(bus);
ForgeMod.enableMilkFluid();
NeoForgeMod.enableMilkFluid();
/// NeoforgeMod.enableMilkFluid();
}

public static void log(String string) {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package com.lothrazar.cyclic.api;

import net.minecraftforge.event.entity.player.PlayerInteractEvent.EntityInteract;
//import net.minecraftforge.event.entity.player.PlayerInteractEvent.EntityInteract;
import net.neoforged.neoforge.event.entity.player.PlayerInteractEvent;

public interface IEntityInteractable {

Expand All @@ -10,5 +11,5 @@ public interface IEntityInteractable {
* @param event
* for the entity interaction on this
*/
void interactWith(EntityInteract event);
void interactWith(PlayerInteractEvent.EntityInteract event);
}
6 changes: 0 additions & 6 deletions src/main/java/com/lothrazar/cyclic/block/BlockCyclic.java
Original file line number Diff line number Diff line change
Expand Up @@ -24,12 +24,6 @@
import net.minecraft.world.level.block.state.properties.BlockStateProperties;
import net.minecraft.world.level.block.state.properties.BooleanProperty;
import net.minecraft.world.phys.BlockHitResult;
import net.minecraftforge.common.capabilities.Capability;
import net.minecraftforge.common.capabilities.ForgeCapabilities;
import net.minecraftforge.fluids.FluidUtil;
import net.minecraftforge.fluids.capability.IFluidHandler;
import net.minecraftforge.items.IItemHandler;
import net.minecraftforge.network.NetworkHooks;

public class BlockCyclic extends EntityBlockFlib {

Expand Down
5 changes: 4 additions & 1 deletion src/main/java/com/lothrazar/cyclic/block/BlockSimple.java
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,9 @@
public class BlockSimple extends BlockFlib {

public BlockSimple(Properties properties) {
super(properties, new BlockFlib.Settings().tooltip());
super(properties, new BlockFlib.Settings().noTooltip());
}
public BlockSimple(Properties properties, BlockFlib.Settings s) {
super(properties, s);
}
}
99 changes: 0 additions & 99 deletions src/main/java/com/lothrazar/cyclic/block/FlowerSimpleBlock.java

This file was deleted.

Loading

0 comments on commit 328943c

Please sign in to comment.