Skip to content

Commit 81dc137

Browse files
committed
Connected Textures ported
1 parent 80290c0 commit 81dc137

19 files changed

+54
-669
lines changed

src/main/resources/assets/neotech/lang/en_US.lang

+1
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ tile.neotech:blockMiniatureStar_yellow.name=§eYellow §rStar Light
4343

4444
# Connected
4545
tile.neotech:phantomGlass.name=Phantom Glass
46+
tile.neotech:voidGlass.name=Void Glass
4647

4748
#######################
4849
# Fluids
Loading
Loading
Loading
Loading
Loading

src/main/scala/com/dyonovan/neotech/client/ConnectedTextureBlocks.scala

-19
This file was deleted.

src/main/scala/com/dyonovan/neotech/client/TextureManager.scala

-51
This file was deleted.

src/main/scala/com/dyonovan/neotech/client/modelfactory/ModelFactory.scala

+2-9
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
package com.dyonovan.neotech.client.modelfactory
2-
3-
import com.dyonovan.neotech.client.ConnectedTextureBlocks
4-
import com.dyonovan.neotech.client.modelfactory.models.{ModelConnectedTextures, ModelHelper, ToolModel, ModelTank}
2+
import com.dyonovan.neotech.client.modelfactory.models.{ModelHelper, ToolModel, ModelTank}
53
import com.dyonovan.neotech.lib.Reference
64
import com.google.common.collect.{ImmutableMap, Maps}
5+
import com.teambr.bookshelf.client.ConnectedTextureBlocks
76
import net.minecraft.client.Minecraft
87
import net.minecraft.client.renderer.block.model.ItemCameraTransforms.TransformType
98
import net.minecraft.client.resources.model.ModelResourceLocation
@@ -59,11 +58,5 @@ class ModelFactory {
5958
new ToolModel(
6059
event.modelRegistry.getObject(new ModelResourceLocation(Reference.MOD_ID + ":" + "electricSword", "inventory")).asInstanceOf[IFlexibleBakedModel],
6160
ImmutableMap.copyOf(builder)))
62-
63-
for(block <- ConnectedTextureBlocks.blocks) {
64-
event.modelRegistry.putObject(block.getNormal, new ModelConnectedTextures())
65-
event.modelRegistry.putObject(block.getInventory, new ModelConnectedTextures())
66-
Minecraft.getMinecraft.getRenderItem.getItemModelMesher.register(Item.getItemFromBlock(block), 0, block.getInventory)
67-
}
6861
}
6962
}

src/main/scala/com/dyonovan/neotech/client/modelfactory/models/ModelConnectedTextures.scala

-109
This file was deleted.

src/main/scala/com/dyonovan/neotech/collections/ConnectedTextures.scala

-161
This file was deleted.

0 commit comments

Comments
 (0)