mirror of
https://github.com/PolyhedralDev/Terra.git
synced 2025-07-03 08:25:31 +00:00
Fabric Enchantments
This commit is contained in:
parent
4569a9ed13
commit
924bc6e469
@ -272,9 +272,12 @@ public class TerraFabricPlugin implements TerraPlugin, ModInitializer {
|
||||
if(!addonRegistry.loadAll()) {
|
||||
throw new IllegalStateException("Failed to load addons. Please correct addon installations to continue.");
|
||||
}
|
||||
logger.info("Loaded addons.");
|
||||
|
||||
registry.loadAll(this);
|
||||
|
||||
logger.info("Loaded packs.");
|
||||
|
||||
Registry.register(Registry.FEATURE, new Identifier("terra", "flora_populator"), POPULATOR_FEATURE);
|
||||
RegistryKey<ConfiguredFeature<?, ?>> floraKey = RegistryKey.of(Registry.CONFIGURED_FEATURE_WORLDGEN, new Identifier("terra", "flora_populator"));
|
||||
Registry.register(BuiltinRegistries.CONFIGURED_FEATURE, floraKey.getValue(), POPULATOR_CONFIGURED_FEATURE);
|
||||
|
@ -7,9 +7,11 @@ import com.dfsek.terra.fabric.world.FabricAdapter;
|
||||
import com.mojang.brigadier.StringReader;
|
||||
import com.mojang.brigadier.exceptions.CommandSyntaxException;
|
||||
import net.minecraft.command.argument.ItemStackArgumentType;
|
||||
import net.minecraft.util.Identifier;
|
||||
import net.minecraft.util.registry.Registry;
|
||||
|
||||
import java.util.Collections;
|
||||
import java.util.Set;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
public class FabricItemHandle implements ItemHandle {
|
||||
|
||||
@ -24,11 +26,11 @@ public class FabricItemHandle implements ItemHandle {
|
||||
|
||||
@Override
|
||||
public Enchantment getEnchantment(String id) {
|
||||
return null;
|
||||
return FabricAdapter.adapt(Registry.ENCHANTMENT.get(Identifier.tryParse(id)));
|
||||
}
|
||||
|
||||
@Override
|
||||
public Set<Enchantment> getEnchantments() {
|
||||
return Collections.emptySet();
|
||||
return Registry.ENCHANTMENT.stream().map(FabricAdapter::adapt).collect(Collectors.toSet());
|
||||
}
|
||||
}
|
||||
|
@ -15,7 +15,6 @@ public class FabricDamageable extends FabricItemMeta implements Damageable {
|
||||
|
||||
@Override
|
||||
public void setDamage(int damage) {
|
||||
System.out.println("Setting damage: " + damage);
|
||||
delegate.setDamage(damage);
|
||||
}
|
||||
|
||||
|
@ -36,7 +36,6 @@ public class FabricItemMeta implements ItemMeta {
|
||||
|
||||
@Override
|
||||
public void addEnchantment(Enchantment enchantment, int level) {
|
||||
System.out.println("Enchanting: " + enchantment.getHandle() + ", " + level);
|
||||
delegate.addEnchantment(FabricAdapter.adapt(enchantment), level);
|
||||
}
|
||||
}
|
||||
|
Loading…
x
Reference in New Issue
Block a user